Skip to content

Commit d8f9993

Browse files
committed
chore: cleanup envs
1 parent f7e65d0 commit d8f9993

File tree

14 files changed

+38
-82
lines changed

14 files changed

+38
-82
lines changed

.github/workflows/build-and-deploy-test-stack.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
jobs:
1515
deploy:
1616
name: Deploy app
17-
environment: 'preview-govtool'
17+
environment: "preview-govtool"
1818
runs-on: ubuntu-latest
1919
steps:
2020
- name: Checkout code
@@ -62,15 +62,13 @@ jobs:
6262
cd $DEST_DIR/tests/test-infrastructure
6363
./build-and-deploy.sh update-images
6464
yes | docker system prune -f || echo "Ignoring system prune eror"
65-
envs: GOVTOOL_TAG, GRAFANA_ADMIN_PASSWORD, GRAFANA_SLACK_RECIPIENT, GRAFANA_SLACK_OAUTH_TOKEN, SENTRY_DSN_BACKEND, GTM_ID, NPMRC_TOKEN, SENTRY_DSN_FRONTEND, PIPELINE_URL, USERSNAP_SPACE_API_KEY, APP_ENV, PDF_API_URL, KUBER_API_KEY, IPFS_GATEWAY, IPFS_PROJECT_ID, OUTCOMES_API_URL
65+
envs: GOVTOOL_TAG, GRAFANA_ADMIN_PASSWORD, GRAFANA_SLACK_RECIPIENT, GRAFANA_SLACK_OAUTH_TOKEN, SENTRY_DSN_BACKEND, SENTRY_DSN_FRONTEND, PIPELINE_URL, USERSNAP_SPACE_API_KEY, APP_ENV, PDF_API_URL, KUBER_API_KEY, IPFS_GATEWAY, IPFS_PROJECT_ID, OUTCOMES_API_URL
6666
env:
6767
GOVTOOL_TAG: ${{ github.sha }}
6868
GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
6969
GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
7070
GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
7171
SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
72-
GTM_ID: ${{ secrets.GTM_ID }}
73-
NPMRC_TOKEN: ${{ secrets.NPMRC_TOKEN }}
7472
SENTRY_DSN_FRONTEND: ${{ secrets.SENTRY_DSN_FRONTEND }}
7573
PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
7674
USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}

.github/workflows/build-from-main.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ jobs:
189189
echo "TAG=${SANITIZED_BRANCH}-${{ github.sha }}-${{ github.run_number }}" >> $GITHUB_ENV
190190
fi
191191
echo "Generated TAG: $TAG"
192-
193192
194193
- name: Lint Dockerfile
195194
id: hadolint
@@ -254,7 +253,7 @@ jobs:
254253

255254
- name: Set ENVIRONMENT Variable
256255
run: echo "ENVIRONMENT=${{ matrix.network }}" >> $GITHUB_ENV
257-
256+
258257
- name: Sanitize Network Name
259258
run: |
260259
CLEAN_NETWORK=$(echo "${{ matrix.network }}" | sed 's/-govtool$//')
@@ -274,10 +273,8 @@ jobs:
274273
VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
275274
VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
276275
VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
277-
VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
278276
VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
279277
VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
280-
NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
281278
VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
282279
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
283280
VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}
@@ -310,11 +307,11 @@ jobs:
310307
311308
- name: Debug TAG Before Docker Push
312309
run: |
313-
echo "Lowercase Image: ${{ steps.image_lowercase.outputs.lowercase }}"
314-
echo "Network: ${{ matrix.network }}"
315-
echo "TAG: ${{ env.TAG }}"
316-
echo "Final Docker Tag: ${{ steps.image_lowercase.outputs.lowercase }}-${{ matrix.network}}:${{ env.TAG }}"
317-
310+
echo "Lowercase Image: ${{ steps.image_lowercase.outputs.lowercase }}"
311+
echo "Network: ${{ matrix.network }}"
312+
echo "TAG: ${{ env.TAG }}"
313+
echo "Final Docker Tag: ${{ steps.image_lowercase.outputs.lowercase }}-${{ matrix.network}}:${{ env.TAG }}"
314+
318315
- name: Push Docker image to GHCR
319316
run: |
320317
docker load -i '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'

.github/workflows/merge.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
name: Check,Build,Deploy
22

3-
on:
4-
workflow_dispatch
3+
on: workflow_dispatch
54

65
permissions:
76
contents: write
@@ -123,10 +122,8 @@ jobs:
123122
VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
124123
VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
125124
VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
126-
VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
127125
VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
128126
VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
129-
NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
130127
VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
131128
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
132129
VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}

.github/workflows/pr.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,10 +115,8 @@ jobs:
115115
VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
116116
VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
117117
VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
118-
VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
119118
VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
120119
VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
121-
NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
122120
VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
123121
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
124122
VITE_PDF_API_URL=${{ secrets.VITE_PDF_API_URL }}

govtool/frontend/.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ VITE_BASE_URL=""
33
VITE_METADATA_API_URL=""
44
VITE_NETWORK_FLAG=0
55
VITE_SENTRY_DSN=""
6-
VITE_GTM_ID=""
76
VITE_IS_DEV=true
87
VITE_USERSNAP_SPACE_API_KEY=""
98
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'

govtool/frontend/Dockerfile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ FROM node:20.18.1-alpine as builder
33
ARG VITE_APP_ENV='beta'
44
ARG VITE_BASE_URL
55
ARG VITE_METADATA_API_URL
6-
ARG VITE_GTM_ID
76
ARG VITE_NETWORK_FLAG=0
87
ARG VITE_SENTRY_DSN
9-
ARG NPMRC_TOKEN
108
ARG VITE_USERSNAP_SPACE_API_KEY
119
ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
1210
ARG VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED='false'
@@ -22,10 +20,8 @@ RUN \
2220
: "${VITE_APP_ENV:?Build argument VITE_APP_ENV is not set}" && \
2321
: "${VITE_BASE_URL:?Build argument VITE_BASE_URL is not set}" && \
2422
: "${VITE_METADATA_API_URL:?Build argument VITE_METADATA_API_URL is not set}" && \
25-
: "${VITE_GTM_ID:?Build argument VITE_GTM_ID is not set}" && \
2623
: "${VITE_NETWORK_FLAG:?Build argument VITE_NETWORK_FLAG is not set}" && \
2724
: "${VITE_SENTRY_DSN:?Build argument VITE_SENTRY_DSN is not set}" && \
28-
: "${NPMRC_TOKEN:?Build argument NPMRC_TOKEN is not set}" && \
2925
: "${VITE_USERSNAP_SPACE_API_KEY:?Build argument VITE_USERSNAP_SPACE_API_KEY is not set}" && \
3026
: "${VITE_PDF_API_URL:?Build argument VITE_PDF_API_URL is not set}" && \
3127
: "${VITE_OUTCOMES_API_URL:?Build argument VITE_OUTCOMES_API_URL is not set}" && \
@@ -36,10 +32,6 @@ RUN \
3632

3733
WORKDIR /src
3834

39-
# Set npm configuration settings using environment variables
40-
RUN npm config set @intersect.mbo:registry "https://registry.npmjs.org/" --location=global
41-
RUN npm config set //registry.npmjs.org/:_authToken ${NPMRC_TOKEN} --location=global
42-
4335
COPY package.json package-lock.json ./
4436
COPY patches ./patches
4537

govtool/frontend/Dockerfile.qovery

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ FROM node:20.18.1-alpine as builder
33
ARG VITE_APP_ENV='beta'
44
ARG VITE_BASE_URL
55
ARG VITE_METADATA_API_URL
6-
ARG VITE_GTM_ID
76
ARG VITE_NETWORK_FLAG=0
87
ARG VITE_SENTRY_DSN
9-
ARG NPMRC_TOKEN
108
ARG VITE_USERSNAP_SPACE_API_KEY
119
ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED
1210
ARG VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED
@@ -19,10 +17,6 @@ WORKDIR /src
1917

2018
ENV NODE_OPTIONS="--max-old-space-size=4096"
2119

22-
# Set npm configuration settings using environment variables
23-
RUN npm config set @intersect.mbo:registry "https://registry.npmjs.org/" --location=global
24-
RUN npm config set //registry.npmjs.org/:_authToken ${NPMRC_TOKEN} --location=global
25-
2620
COPY package.json package-lock.json ./
2721
COPY patches ./patches
2822

govtool/frontend/default.nix

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
, incl
33
, VITE_BASE_URL ? "http://localhost"
44
, VITE_IS_DEV ? "true"
5-
, VITE_GTM_ID ? ""
65
, VITE_SENTRY_DSN ? ""
76
, VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED ? ""
87
, VITE_PDF_API_URL ? ""
@@ -32,7 +31,7 @@ let
3231
name = "govtool-website";
3332
src = frontendSrc;
3433
buildInputs = [(pkgs.yarn.override { nodejs = pkgs.nodejs_18;}) nodeModules];
35-
inherit VITE_BASE_URL VITE_IS_DEV VITE_GTM_ID VITE_SENTRY_DSN VITE_NETWORK_FLAG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED VITE_PDF_API_URL;
34+
inherit VITE_BASE_URL VITE_IS_DEV VITE_SENTRY_DSN VITE_NETWORK_FLAG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED VITE_PDF_API_URL;
3635
buildPhase = ''
3736
cp -R ${nodeModules}/libexec/@govtool/frontend/node_modules node_modules
3837

govtool/frontend/package-lock.json

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

govtool/frontend/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
"react": "^18.2.0",
5151
"react-diff-view": "^3.2.1",
5252
"react-dom": "^18.2.0",
53-
"react-gtm-module": "^2.0.11",
5453
"react-hook-form": "^7.47.0",
5554
"react-i18next": "^14.0.1",
5655
"react-markdown": "^9.0.1",

0 commit comments

Comments
 (0)