From f7c9c44ea7f44ec86fa1dd416e46ee43bbf38772 Mon Sep 17 00:00:00 2001
From: Donkie <daniel.cf.hultgren@gmail.com>
Date: Thu, 25 Jan 2024 22:58:25 +0100
Subject: [PATCH] Write build info earlier when we still have git

---
 .github/workflows/ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 549433f..19cb7c2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -70,6 +70,11 @@ jobs:
           rm -f .env && echo "VITE_APIURL=/api/v1" > .env.production
           npm run build
 
+      - name: Write build info
+        run: |
+          echo "GIT_COMMIT=$(git rev-parse --short HEAD)" > build.txt
+          echo "BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> build.txt
+  
       # Remove client source and keep only the built dist
       - name: Clean
         run: |
@@ -83,11 +88,6 @@ jobs:
         run: |
           chmod +x scripts/*.sh
       
-      - name: Write build info
-        run: |
-          echo "GIT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")" > build.txt
-          echo "BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> build.txt
-
       - name: Upload client Spoolman artifact
         uses: actions/upload-artifact@v3
         with:
@@ -346,7 +346,7 @@ jobs:
 
       - name: Store git commit and build date
         run: |
-          echo "GIT_COMMIT=$(git rev-parse --short "$GITHUB_SHA")" >> "$GITHUB_ENV"
+          echo "GIT_COMMIT=$(git rev-parse --short HEAD)" >> "$GITHUB_ENV"
           echo "BUILD_DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "$GITHUB_ENV"
 
       - name: Build and push Docker images