From 5c7e4d45d42b85589904b11dffb7b91dbb420eaa Mon Sep 17 00:00:00 2001 From: Chris Farhood Date: Sat, 16 May 2026 21:02:41 -0400 Subject: [PATCH] ci: revert to auto GITEA_TOKEN for registry auth Gitea 1.26 (PR #36173) honors permissions.packages: write on the auto-provided GITEA_TOKEN, so the PAT workaround is no longer needed. You can delete the REGISTRY_TOKEN org secret. Co-Authored-By: Claude Opus 4.7 (1M context) --- .gitea/workflows/ci.yml | 8 ++++---- .gitea/workflows/helm-release.yml | 4 ++-- .gitea/workflows/release-beta.yml | 12 ++++++------ .gitea/workflows/release.yml | 12 ++++++------ .gitea/workflows/rollback.yml | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index dd9afef..74e0e57 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -59,8 +59,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Build and push worker image uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 @@ -91,8 +91,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Build and push API image uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 diff --git a/.gitea/workflows/helm-release.yml b/.gitea/workflows/helm-release.yml index e1a3f7a..e022893 100644 --- a/.gitea/workflows/helm-release.yml +++ b/.gitea/workflows/helm-release.yml @@ -31,8 +31,8 @@ jobs: - name: Log in to Gitea OCI registry run: | - echo "${{ secrets.REGISTRY_TOKEN }}" | helm registry login git.farh.net \ - --username gitea-admin \ + echo "${{ secrets.GITEA_TOKEN }}" | helm registry login git.farh.net \ + --username "${{ github.actor }}" \ --password-stdin - name: Push chart to Gitea OCI registry diff --git a/.gitea/workflows/release-beta.yml b/.gitea/workflows/release-beta.yml index 08df39a..9bbd5e2 100644 --- a/.gitea/workflows/release-beta.yml +++ b/.gitea/workflows/release-beta.yml @@ -62,8 +62,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Build and push worker image uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 @@ -93,8 +93,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Build and push API image uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 @@ -125,8 +125,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Inspect worker image id: inspect-worker diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 9656246..18ac2a0 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -77,8 +77,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Build and push worker image uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 @@ -111,8 +111,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Build and push API image uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0 @@ -145,8 +145,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Inspect worker image id: inspect-worker diff --git a/.gitea/workflows/rollback.yml b/.gitea/workflows/rollback.yml index c72e098..c4c34bd 100644 --- a/.gitea/workflows/rollback.yml +++ b/.gitea/workflows/rollback.yml @@ -78,8 +78,8 @@ jobs: uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0 with: registry: git.farh.net - username: gitea-admin - password: ${{ secrets.REGISTRY_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITEA_TOKEN }} - name: Verify Docker image tag exists run: docker buildx imagetools inspect "git.farh.net/farhoodlabs/trebuchet:${{ steps.target.outputs.version }}"