fix ci

PBH-BTN · Sep 16, 2024 · f173a92 · f173a92
1 parent 7ffea4d
commit f173a92
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/.github/workflows/build_spk.yml b/.github/workflows/build_spk.yml
@@ -18,11 +18,6 @@ jobs:
         with:
           name: maven-dist
           path: target/
-      - name: Set short git commit SHA
-        id: vars
-        run: |
-          calculatedSha=$(git rev-parse --short ${{ github.sha }})
-          echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
       - name: Run build script
         run: sudo PBH_VERSION=${{ env.PBH_VERSION }} IMAGE=${{ env.IMAGE }} bash pkg/synopkg/build-script.sh
         env:

diff --git a/.github/workflows/jvm-ci.yml b/.github/workflows/jvm-ci.yml
@@ -18,12 +18,12 @@ jobs:
   Build_Installers:
     needs: CI
     uses: ./.github/workflows/build_installers.yml
-    secrets: inherit
+    secrets:
   Build_SPK:
     needs: CI
     uses: ./.github/workflows/build_spk.yml
     with:
-      image: ghostchu/peerbanhelper-snapshot:sha-${{ env.COMMIT_SHORT_SHA }}
+      image: ghostchu/peerbanhelper-snapshot:sha-$(git rev-parse --short ${{ github.sha }})
   Build_DEB:
     needs: CI
     uses: ./.github/workflows/build_deb.yml