Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Actually fixing deployment (real this time) #208

Merged
merged 1 commit into from
Jun 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -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
deploy.sh @idreyn @mathcolo @devinmatte @nathan-weinberg
.flake8 @idreyn @mathcolo @devinmatte @nathan-weinberg
1 change: 1 addition & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
ci/cd:
- .github/**/*
- devops/**/*
- deploy.sh

dependencies:
- package.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/components/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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} />
</>
);
};
2 changes: 1 addition & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()],
Expand Down
Loading