fix: Commit hash missing in nightly build

Its-treason · Sep 8, 2024 · 9458c2e · 9458c2e
1 parent 881941b
commit 9458c2e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -54,11 +54,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Get short SHA
+        id: slug
+        run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
       - name: Fetch dependencies
         run: |
           npm i -g pnpm
           pnpm i
       - name: Make
+        env:
+          COMMIT_SHORT_SHA: ${{ steps.slug.outputs.SHORT_SHA }}
         run: |
           pnpm run make
 
@@ -79,11 +85,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Get short SHA
+        id: slug
+        run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
       - name: Fetch dependencies
         run: |
           npm i -g pnpm
           pnpm i
       - name: Make
+        env:
+          COMMIT_SHORT_SHA: ${{ steps.slug.outputs.SHORT_SHA }}
         run: |
           pnpm run make
 
@@ -106,11 +118,17 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Get short SHA
+        id: slug
+        run: echo "SHORT_SHA=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
+
       - name: Fetch dependencies
         run: |
           npm i -g pnpm
           pnpm i
       - name: Make
+        env:
+          COMMIT_SHORT_SHA: ${{ steps.slug.outputs.SHORT_SHA }}
         run: |
           pnpm run make
           ls ./packages/bruno-electron/out/

diff --git a/packages/bruno-electron/vite.base.config.ts b/packages/bruno-electron/vite.base.config.ts
@@ -13,9 +13,9 @@ export const external = [
 // Get the latest commit hash
 const getLatestCommitHash = () => {
   try {
-    return execSync('git rev-parse --short HEAD').toString().trim();
+    return process.env.COMMIT_SHORT_SHA || execSync('git rev-parse --short HEAD').toString().trim();
   } catch (error) {
-    console.error('Failed to get git commit hash:', error);
+    console.warn('Failed to get git commit hash', error);
     return 'Unknown';
   }
 };