back to Artur's way of passing commit hash, handle gitVersion in the astro config

Author: egeakman

.github/workflows/preview.yml

@@ -39,10 +39,6 @@ jobs:
           BRANCH_NAME=$(make safe_branch BRANCH=$GITHUB_BRANCH_NAME)
           echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_ENV
 
-      - name: Export short commit hash
-        run:
-          echo "GITHUB_COMMIT_HASH=${GITHUB_COMMIT_HASH:0:7}" >> "$GITHUB_ENV"
-
       - name: Build the website
         run: |
           make build MODE=preview

astro.config.mjs

@@ -13,10 +13,19 @@ import deleteUnusedImages from "astro-delete-unused-images";
 import preload from "astro-preload";
 import { execSync } from "node:child_process";
 
-let gitVersion = "";
-try {
-  gitVersion = execSync("git rev-parse --short HEAD 2>&1 > /dev/null");
-} catch (e) {}
+let gitVersion = String(import.meta.env.GIT_VERSION ?? "").slice(0, 7);
+
+if (!gitVersion) {
+  try {
+    gitVersion = execSync("git rev-parse --short HEAD", {
+      stdio: ["ignore", "pipe", "ignore"],
+    })
+      .toString()
+      .trim();
+  } catch {
+    gitVersion = "unknown";
+  }
+}
 
 // https://astro.build/config
 export default defineConfig({