From 9a13fc4efd2ebef03d965364a0797476ef1ac12e Mon Sep 17 00:00:00 2001
From: Danny Daemonic <DannyDaemonic@gmail.com>
Date: Wed, 23 Aug 2023 05:50:58 -0700
Subject: [PATCH] Add the short hash back into the tag

---
 .github/workflows/build.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d5a27c1f4..f8fe39627 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -296,10 +296,11 @@ jobs:
         shell: bash
         run: |
           BUILD_NUMBER="$(git rev-list --count HEAD)"
+          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
           if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-            echo "name=$BUILD_NUMBER" >> $GITHUB_OUTPUT
+            echo "name=$BUILD_NUMBER-$SHORT_HASH" >> $GITHUB_OUTPUT
           else
-            echo "name=${{ env.BRANCH_NAME }}-$BUILD_NUMBER" >> $GITHUB_OUTPUT
+            echo "name=${{ env.BRANCH_NAME }}-$BUILD_NUMBER-$SHORT_HASH" >> $GITHUB_OUTPUT
           fi
 
       - name: Pack artifacts
@@ -349,10 +350,11 @@ jobs:
         shell: bash
         run: |
           BUILD_NUMBER="$(git rev-list --count HEAD)"
+          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
           if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-            echo "name=$BUILD_NUMBER" >> $GITHUB_OUTPUT
+            echo "name=$BUILD_NUMBER-$SHORT_HASH" >> $GITHUB_OUTPUT
           else
-            echo "name=${{ env.BRANCH_NAME }}-$BUILD_NUMBER" >> $GITHUB_OUTPUT
+            echo "name=${{ env.BRANCH_NAME }}-$BUILD_NUMBER-$SHORT_HASH" >> $GITHUB_OUTPUT
           fi
 
       - name: Pack artifacts
@@ -421,10 +423,11 @@ jobs:
         shell: bash
         run: |
           BUILD_NUMBER="$(git rev-list --count HEAD)"
+          SHORT_HASH="$(git rev-parse --short=7 HEAD)"
           if [[ "${{ env.BRANCH_NAME }}" == "master" ]]; then
-            echo "name=$BUILD_NUMBER" >> $GITHUB_OUTPUT
+            echo "name=$BUILD_NUMBER-$SHORT_HASH" >> $GITHUB_OUTPUT
           else
-            echo "name=${{ env.BRANCH_NAME }}-$BUILD_NUMBER" >> $GITHUB_OUTPUT
+            echo "name=${{ env.BRANCH_NAME }}-$BUILD_NUMBER-$SHORT_HASH" >> $GITHUB_OUTPUT
           fi
 
       - name: Download artifacts