From 448095c5bd74306ff22f3307220abc875a13292a Mon Sep 17 00:00:00 2001
From: Devin Matte <devinmatte@gmail.com>
Date: Thu, 6 Jun 2024 20:11:58 -0400
Subject: [PATCH] Okay fixing for real now

---
 .github/CODEOWNERS           | 4 ++--
 .github/labeler.yml          | 1 +
 .github/workflows/deploy.yml | 2 +-
 deploy.sh                    | 2 +-
 src/components/App.tsx       | 2 +-
 vite.config.ts               | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9efc901..0e85a68 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,4 +1,4 @@
 *         @idreyn @mathcolo @devinmatte
 /.github/ @idreyn @mathcolo @devinmatte @nathan-weinberg
-/devops/  @idreyn @mathcolo @devinmatte @nathan-weinberg
-.flake8   @idreyn @mathcolo @devinmatte @nathan-weinberg
\ No newline at end of file
+deploy.sh @idreyn @mathcolo @devinmatte @nathan-weinberg
+.flake8   @idreyn @mathcolo @devinmatte @nathan-weinberg
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 33dfc63..8fe2aa6 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,6 +1,7 @@
 ci/cd:
 - .github/**/*
 - devops/**/*
+- deploy.sh
 
 dependencies:
 - package.json
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bd24ccb..5c801d5 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -49,4 +49,4 @@ jobs:
         run: |
           curl -sSL https://install.python-poetry.org | python3 -
           npm ci
-          cd devops && bash ./deploy.sh -p
+          bash ./deploy.sh -p
diff --git a/deploy.sh b/deploy.sh
index f81f572..d7449eb 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -47,7 +47,7 @@ fi
 # Identify the version and commit of the current deploy
 GIT_VERSION=`git describe --tags --always`
 GIT_SHA=`git rev-parse HEAD`
-GIT_ABR_VERSION=`git describe --tags --abbrev=0`
+export GIT_ABR_VERSION=`git describe --tags --abbrev=0`
 echo "Deploying version $GIT_VERSION | $GIT_SHA"
 
 # Adding some datadog tags to get better data
diff --git a/src/components/App.tsx b/src/components/App.tsx
index 221488e..cd27146 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -100,7 +100,7 @@ export const App: React.FC = () => {
                 </div>
             )}
             <LineStats line={selectedLine?.name} />
-            <Footer version={process.env.GIT_VERSION} />
+            <Footer version={process.env.GIT_ABR_VERSION} />
         </>
     );
 };
diff --git a/vite.config.ts b/vite.config.ts
index 5ec0e72..9da4514 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -8,7 +8,7 @@ export default defineConfig({
     },
     define: {
         'process.env': {
-            GIT_VERSION: process.env.GIT_ABR_VERSION,
+            GIT_ABR_VERSION: process.env.GIT_ABR_VERSION,
         },
     },
     plugins: [react()],