Add commit hash to client sidebar

devsoc-unsw · Dec 23, 2024 · a9327d2 · a9327d2
1 parent 1e69af5
commit a9327d2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/.github/workflows/docker-staging.yml b/.github/workflows/docker-staging.yml
@@ -42,6 +42,7 @@ jobs:
             GOOGLE_OAUTH_CLIENT_ID=${{ secrets.GOOGLE_OAUTH_CLIENT_ID }}
             SENTRY_INGEST_CLIENT=${{ secrets.SENTRY_INGEST_CLIENT }}
             SENTRY_TRACE_RATE_CLIENT=${{ secrets.SENTRY_TRACE_RATE_CLIENT }}
+            GIT_COMMIT=${{ github.sha }}
           tags: |
             ghcr.io/csesoc/notangles-client:${{ github.sha }}
             ghcr.io/csesoc/notangles-client:latest

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -42,6 +42,7 @@ jobs:
             GOOGLE_OAUTH_CLIENT_ID=${{ secrets.GOOGLE_OAUTH_CLIENT_ID }}
             SENTRY_INGEST_CLIENT=${{ secrets.SENTRY_INGEST_CLIENT }}
             SENTRY_TRACE_RATE_CLIENT=${{ secrets.SENTRY_TRACE_RATE_CLIENT }}
+            GIT_COMMIT=${{ github.sha }}
           tags: |
             ghcr.io/csesoc/notangles-client:${{ github.sha }}
             ghcr.io/csesoc/notangles-client:latest
@@ -122,4 +123,4 @@ jobs:
           git commit -m "feat(notangles): update images" 
           git push -u origin update/notangles/${{ github.sha }}
           gh pr create -B migration --title "feat(notangles): update images" --body "Updates the images for the notangles deployment to commit csesoc/notangles@${{ github.sha }}." > URL
-          gh pr merge $(cat URL) --squash -d
+          gh pr merge $(cat URL) --squash -d
diff --git a/client/Dockerfile b/client/Dockerfile
@@ -27,6 +27,9 @@ ENV VITE_APP_SENTRY_TRACE_RATE_CLIENT=$SENTRY_TRACE_RATE_CLIENT
 ENV VITE_APP_ENVIRONMENT=production
 ENV NODE_ENV=production
 
+ARG GIT_COMMIT
+RUN if [ -n "$GIT_COMMIT" ]; then export VITE_COMMIT=$GIT_COMMIT; fi
+
 RUN pnpm run build
 
 FROM caddy:2.8.4-alpine

diff --git a/client/src/components/sidebar/Sidebar.tsx b/client/src/components/sidebar/Sidebar.tsx
@@ -248,7 +248,7 @@ const Sidebar: React.FC = () => {
           {!collapsed ? (
             <SidebarFooterText>
               <Divider />
-              <span>© DevSoc {new Date().getFullYear()}, v1.0.0</span>
+              <span>{import.meta.env.VITE_COMMIT?.substring(0, 7) ?? 'unknown commit'}</span>
             </SidebarFooterText>
           ) : (
             <CollapseButton collapsed={collapsed} onClick={() => handleCollapse(false)} toolTipTitle="Expand" />