From 0e5e6f21eb9d28e094b4f5af756c68ebd9fd3c79 Mon Sep 17 00:00:00 2001 From: SergeantPanda Date: Thu, 10 Apr 2025 11:41:22 -0500 Subject: [PATCH] One more attempt at fixes lowercase conversion. --- .github/workflows/ci.yml | 12 +++++++++--- .github/workflows/release.yml | 10 ++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0a4d4e4b..38dd5967 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -35,13 +35,19 @@ jobs: echo "build=$BUILD" >> $GITHUB_OUTPUT echo "sha_short=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT + - name: Set lowercase repo owner + id: repo_owner + run: | + REPO_OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]') + echo "lowercase=$REPO_OWNER" >> $GITHUB_OUTPUT + - name: Build and push Docker image uses: docker/build-push-action@v4 with: context: . push: ${{ github.event_name != 'pull_request' }} tags: | - ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ github.ref == 'refs/heads/main' && 'latest' || 'dev' }} - ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ steps.version.outputs.version }}-${{ steps.version.outputs.build }} - ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ steps.version.outputs.sha_short }} + ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/dispatcharr:${{ github.ref == 'refs/heads/main' && 'latest' || 'dev' }} + ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/dispatcharr:${{ steps.version.outputs.version }}-${{ steps.version.outputs.build }} + ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/dispatcharr:${{ steps.version.outputs.sha_short }} file: ./docker/Dockerfile diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 946740c4..8911b5c8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,6 +33,12 @@ jobs: NEW_VERSION=$(python -c "import version; print(f'{version.__version__}')") echo "new_version=$NEW_VERSION" >> $GITHUB_OUTPUT + - name: Set lowercase repo owner + id: repo_owner + run: | + REPO_OWNER=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]') + echo "lowercase=$REPO_OWNER" >> $GITHUB_OUTPUT + - name: Commit and Tag run: | git add version.py @@ -46,8 +52,8 @@ jobs: context: . push: true tags: | - ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:latest - ghcr.io/${{ github.repository_owner != '' && github.repository_owner | lower || 'dispatcharr' }}/dispatcharr:${{ steps.update_version.outputs.new_version }} + ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/dispatcharr:latest + ghcr.io/${{ steps.repo_owner.outputs.lowercase }}/dispatcharr:${{ steps.update_version.outputs.new_version }} file: ./docker/Dockerfile - name: Create GitHub Release