From 9954c415216425437a07fd19a1bc96fe5af8143a Mon Sep 17 00:00:00 2001
From: Or Ricon <rikonor@gmail.com>
Date: Thu, 8 Aug 2024 11:25:59 -0400
Subject: [PATCH] fix short sha derivation

---
 .github/workflows/targets.yml | 6 +++---
 build/kernel.sh               | 2 +-
 build/ovmf.sh                 | 2 +-
 build/qemu.sh                 | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml
index bf5aecd..464faac 100644
--- 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
index 8340479..ba53386 100644
--- 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}"
\ No newline at end of file
diff --git a/build/ovmf.sh b/build/ovmf.sh
index e966a1a..cf4acf2 100644
--- 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}"
\ No newline at end of file
diff --git a/build/qemu.sh b/build/qemu.sh
index cf8eda8..82feb8e 100644
--- a/build/qemu.sh
+++ b/build/qemu.sh
@@ -24,4 +24,4 @@ make install
 # Package
 checkinstall -D -y \
     --pkgname=qemu \
-    --pkgversion=8
\ No newline at end of file
+    --pkgversion=8