From ee7b68842d6fd47864fb58db5ec6f6bdb9c9e430 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 15 Jan 2025 14:44:16 +0100 Subject: [PATCH 1/2] fix: use data.forgejo.org/oci Otherwise it may get rate limited in the CI verifying it works --- .forgejo/workflows/build-release-integration.yml | 2 +- internal/app/cmd/register.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/build-release-integration.yml b/.forgejo/workflows/build-release-integration.yml index eaa75a73..1b3d8744 100644 --- a/.forgejo/workflows/build-release-integration.yml +++ b/.forgejo/workflows/build-release-integration.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 - id: forgejo - uses: https://code.forgejo.org/actions/setup-forgejo@v2.0.5 + uses: https://data.forgejo.org/actions/setup-forgejo@v2.0.5 with: user: root password: admin1234 diff --git a/internal/app/cmd/register.go b/internal/app/cmd/register.go index 803511a0..d3624828 100644 --- a/internal/app/cmd/register.go +++ b/internal/app/cmd/register.go @@ -91,7 +91,7 @@ const ( ) var defaultLabels = []string{ - "docker:docker://node:20-bullseye", + "docker:docker://data.forgejo.org/oci/node:20-bullseye", } type registerInputs struct { From 6567e23ca0a3984431ae420db18e1b2ae71d7b24 Mon Sep 17 00:00:00 2001 From: Earl Warren Date: Wed, 15 Jan 2025 16:00:11 +0100 Subject: [PATCH 2/2] fix: upgrade forgejo-build-publish/build@v5.3.1 So that it does not use docker.io --- .forgejo/workflows/build-release.yml | 4 ++-- .forgejo/workflows/publish-release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/build-release.yml b/.forgejo/workflows/build-release.yml index 8bbfd1b5..e027f8b0 100644 --- a/.forgejo/workflows/build-release.yml +++ b/.forgejo/workflows/build-release.yml @@ -71,7 +71,7 @@ jobs: - name: build without TOKEN if: ${{ secrets.TOKEN == '' }} - uses: https://code.forgejo.org/forgejo/forgejo-build-publish/build@v5 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.1 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" @@ -88,7 +88,7 @@ jobs: - name: build with TOKEN if: ${{ secrets.TOKEN != '' }} - uses: https://code.forgejo.org/forgejo/forgejo-build-publish/build@v5 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/build@v5.3.1 with: forgejo: "${{ env.GITHUB_SERVER_URL }}" owner: "${{ env.GITHUB_REPOSITORY_OWNER }}" diff --git a/.forgejo/workflows/publish-release.yml b/.forgejo/workflows/publish-release.yml index f68060cd..184b8b94 100644 --- a/.forgejo/workflows/publish-release.yml +++ b/.forgejo/workflows/publish-release.yml @@ -28,7 +28,7 @@ jobs: - uses: actions/checkout@v4 - name: copy & sign - uses: https://code.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.0 + uses: https://code.forgejo.org/forgejo/forgejo-build-publish/publish@v5.3.1 with: from-forgejo: ${{ secrets.FORGEJO }} to-forgejo: ${{ secrets.FORGEJO }}