From c1d8678eeb58832286a755f7b69e2b1c7f4fd5a3 Mon Sep 17 00:00:00 2001 From: strawberry Date: Wed, 24 Apr 2024 18:32:51 -0400 Subject: [PATCH] try moving a couple things around in CI Signed-off-by: strawberry --- .github/workflows/ci.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf822b48..bf9041dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -166,9 +166,6 @@ jobs: runs-on: ubuntu-latest needs: build if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev' - permissions: - packages: write - contents: read steps: - name: Download artifacts uses: actions/download-artifact@v4 @@ -196,11 +193,11 @@ jobs: env: GITHUB_USERNAME: ${{ github.repository_owner }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPO_GHCR: "ghcr.io/${{ github.repository }}" + SHA_TAG: "${{ github.ref_name }}-${{ github.sha }}" + BRANCH_TAG: ${{ github.ref_name }} if: ${{ (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && (github.event_name != 'pull_request') && (env.GITHUB_USERNAME != '') && (env.GITHUB_TOKEN != '') }} run: | - REPO_GHCR="ghcr.io/${{ github.repository }}" - SHA_TAG="${{ github.ref_name }}-${{ github.sha }}" - BRANCH_TAG="${{ github.ref_name }}" if [ "$BRANCH_TAG" == "main" ]; then BRANCH_TAG="latest" fi