fixing commit ids.. once again

ManiMatter · Feb 18, 2024 · 11710a5 · 11710a5
1 parent df3e4fc
commit 11710a5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml
@@ -64,7 +64,7 @@ jobs:
             --label com.decluttarr.version=$IMAGE_TAG \
             --label com.decluttarr.commit=$SHORT_COMMIT_ID \
             --build-arg IMAGE_TAG=$IMAGE_TAG \
-            --build-arg SHORT_COMMIT_ID=$COMMIT_SHORT_SHA \
+            --build-arg SHORT_COMMIT_ID=$SHORT_COMMIT_ID \
             -f docker/Dockerfile \
             --push .
           

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -42,11 +42,16 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           WITH_V: true
 
+      - name: Store short Commit ID in env variable
+        id: vars
+        run: |
+          calculatedSha=$(git rev-parse --short ${{ github.sha }})
+          echo "SHORT_COMMIT_ID=$calculatedSha" >> $GITHUB_ENV
+
       - name: "Build, Tag, and push the Docker image"
         env:
           IMAGE_NAME: ghcr.io/manimatter/decluttarr
           IMAGE_TAG: ${{ steps.setversion.outputs.new_tag }}
-          SHORT_COMMIT_ID: ${{ github.sha_short }}
         run: |
           docker buildx build \
             --platform linux/amd64,linux/arm64 \