Merge pull request #518 from codeforboston/mattdelsordo/ui-staging

provide git metadata in workflow
codeforboston · Dec 15, 2023 · f79e139 · f79e139
2 parents 3875672 + 1fa7a2a
commit f79e139
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -28,6 +28,8 @@ jobs:
       context: frontend/front
       port: 8080
       build-args: |
+        REACT_APP_GIT_SHA=${{ github.sha }}
+        REACT_APP_GIT_REF=${{ github.ref_name }}
         REACT_APP_RECAPTCHA_KEY=6LdHAxYmAAAAAHGN0eNzJhGpCrxm7FisXyZoy8cr
         REACT_APP_PUBLIC_SURVEY_ENABLED='false'
         REACT_APP_API_URL=${{ github.event_name == 'release' && 'https://api.bostonhpa.org' || 'https://api.staging.bostonhpa.org' }}
diff --git a/frontend/front/package.json b/frontend/front/package.json
@@ -33,8 +33,8 @@
     "web-vitals": "^2.1.0"
   },
   "scripts": {
-    "start": "cross-env REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) PORT=3001 react-scripts start",
-    "build": "cross-env REACT_APP_GIT_SHA=$(git rev-parse --short HEAD) react-scripts build",
+    "start": "PORT=3001 react-scripts start",
+    "build": "react-scripts build",
     "serve": "serve -l 3001 build/",
     "test": "react-scripts test",
     "test-style": "run-s lint prettier",

diff --git a/frontend/front/src/pages/Metadata.jsx b/frontend/front/src/pages/Metadata.jsx
@@ -1,9 +1,12 @@
 import { useMemo } from "react";
 
+const MISSING_MESSAGE = "This value should be supplied by the GitHub workflow";
+
 export const Metadata = () => {
   const metadata = useMemo(
     () => ({
-      gitRevision: process.env.REACT_APP_GIT_SHA,
+      gitSha: process.env.REACT_APP_GIT_SHA ?? MISSING_MESSAGE,
+      gitRef: process.env.REACT_APP_GIT_REF ?? MISSING_MESSAGE,
     }),
     []
   );