use COMMIT_HASH directly as well

Author: tomdaley92

.github/workflows/build-reusable.yml

@@ -27,6 +27,7 @@ jobs:
       - name: Build macOS (x86_64 + arm64)
         env:
           VERSION: ${{ steps.sanitize.outputs.ref_name }}
+          COMMIT_HASH: ${{ github.sha }}
         run: |
           cd MacOS
           make clean
@@ -63,6 +64,7 @@ jobs:
       - name: Build Windows (x64)
         env:
           VERSION: ${{ steps.sanitize.outputs.ref_name }}
+          COMMIT_HASH: ${{ github.sha }}
         shell: cmd
         run: |
           cd Windows

macos/makefile

@@ -1,12 +1,15 @@
 APP_NAME = Kiwi8
 
-# Use GITHUB_REF_NAME from GitHub Actions, or default values for local builds
+# Use VERSION if set, otherwise fall back to GITHUB_REF_NAME, then default to unknown
 VERSION ?= $(GITHUB_REF_NAME)
 ifeq ($(VERSION),)
 VERSION = unknown
 endif
 
-COMMIT_HASH := $(if $(GITHUB_SHA),$(GITHUB_SHA),unknown)
+COMMIT_HASH ?= $(GITHUB_SHA)
+ifeq ($(COMMIT_HASH),)
+COMMIT_HASH = unknown
+endif
 
 APP_MANIFEST = src/Info.plist
 APP_BUNDLE = $(APP_NAME).app

windows/makefile

@@ -9,11 +9,13 @@ VERSION = unknown
 !ENDIF
 !ENDIF
 
+!IFNDEF COMMIT_HASH
 !IFDEF GITHUB_SHA
 COMMIT_HASH = $(GITHUB_SHA)
 !ELSE
 COMMIT_HASH = unknown
 !ENDIF
+!ENDIF
 
 APP_EXE = $(APP_NAME).exe
 APP_PDB = $(APP_NAME).pdb