Merge pull request #10 from dfinity/or-fix-short-sha

fix short sha derivation
dfinity · Aug 8, 2024 · a4634fa · a4634fa
2 parents 9d3877c + 9954c41
commit a4634fa
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml
@@ -108,7 +108,7 @@ jobs:
               bash /local/build/kernel.sh
 
       - name: Set short sha
-        run: echo "SHORT_SHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+        run: echo "SHORT_SHA=$(echo ${{ github.sha }} | cut -c -7)" >> $GITHUB_ENV
 
       - name: Publish
         uses: softprops/action-gh-release@v1
@@ -171,7 +171,7 @@ jobs:
               bash /local/build/ovmf.sh
 
       - name: Set short sha
-        run: echo "SHORT_SHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+        run: echo "SHORT_SHA=$(echo ${{ github.sha }} | cut -c -7)" >> $GITHUB_ENV
 
       - name: Publish
         uses: softprops/action-gh-release@v1
@@ -234,7 +234,7 @@ jobs:
               bash /local/build/qemu.sh
 
       - name: Set short sha
-        run: echo "SHORT_SHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+        run: echo "SHORT_SHA=$(echo ${{ github.sha }} | cut -c -7)" >> $GITHUB_ENV
 
       - name: Publish
         uses: softprops/action-gh-release@v1

diff --git a/build/kernel.sh b/build/kernel.sh
@@ -31,4 +31,4 @@ find "${BUILD_DIR}/.." -name "linux-image*.deb" -not -name "*dbg*" -exec dpkg -i
 
 # Output
 find "${BUILD_DIR}/.." -name "linux-image*.deb" -not -name "*dbg*" | xargs -I {} cp {} "${OUT_DIR}"
-find "/boot" -name "initrd*" -or -name "vmlinuz*" -or -name "config*" | xargs -I {} cp {} "${OUT_DIR}"
+find "/boot" -name "initrd*" -or -name "vmlinuz*" -or -name "config*" | xargs -I {} cp {} "${OUT_DIR}"
diff --git a/build/ovmf.sh b/build/ovmf.sh
@@ -29,4 +29,4 @@ build \
     -n $(nproc)
 
 # Output
-cp "${SOURCE_DIR}/Build/AmdSev/DEBUG_GCC5/FV/OVMF.fd" "${OUT_DIR}"
+cp "${SOURCE_DIR}/Build/AmdSev/DEBUG_GCC5/FV/OVMF.fd" "${OUT_DIR}"
diff --git a/build/qemu.sh b/build/qemu.sh
@@ -24,4 +24,4 @@ make install
 # Package
 checkinstall -D -y \
     --pkgname=qemu \
-    --pkgversion=8
+    --pkgversion=8