Skip to content

Commit c7ce106

Browse files
authored
Merge pull request #3483 from IntersectMBO/chore/revert-envs-cleanup
Revert "chore: cleanup envs"
2 parents d5027d3 + 3b22509 commit c7ce106

File tree

13 files changed

+80
-37
lines changed

13 files changed

+80
-37
lines changed

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

Lines changed: 4 additions & 2 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,13 +62,15 @@ 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, 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, 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
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 }}
7274
SENTRY_DSN_FRONTEND: ${{ secrets.SENTRY_DSN_FRONTEND }}
7375
PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
7476
USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ jobs:
189189
echo "TAG=${SANITIZED_BRANCH}-${{ github.sha }}-${{ github.run_number }}" >> $GITHUB_ENV
190190
fi
191191
echo "Generated TAG: $TAG"
192+
192193

193194
- name: Lint Dockerfile
194195
id: hadolint
@@ -253,7 +254,7 @@ jobs:
253254

254255
- name: Set ENVIRONMENT Variable
255256
run: echo "ENVIRONMENT=${{ matrix.network }}" >> $GITHUB_ENV
256-
257+
257258
- name: Sanitize Network Name
258259
run: |
259260
CLEAN_NETWORK=$(echo "${{ matrix.network }}" | sed 's/-govtool$//')
@@ -273,8 +274,10 @@ jobs:
273274
VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
274275
VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
275276
VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
277+
VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
276278
VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
277279
VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
280+
NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
278281
VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
279282
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
280283
VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}
@@ -307,11 +310,11 @@ jobs:
307310
308311
- name: Debug TAG Before Docker Push
309312
run: |
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-
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+
315318
- name: Push Docker image to GHCR
316319
run: |
317320
docker load -i '/tmp/image-${{ matrix.name }}-${{ env.ENVIRONMENT }}.tar'

.github/workflows/merge.yaml

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

3-
on: workflow_dispatch
3+
on:
4+
workflow_dispatch
45

56
permissions:
67
contents: write
@@ -122,8 +123,10 @@ jobs:
122123
VITE_APP_ENV=${{ secrets.VITE_APP_ENV }}
123124
VITE_BASE_URL=${{ secrets.VITE_BASE_URL }}
124125
VITE_METADATA_API_URL=${{ secrets.VITE_METADATA_API_URL }}
126+
VITE_GTM_ID=${{ secrets.VITE_GTM_ID }}
125127
VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
126128
VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
129+
NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
127130
VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
128131
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
129132
VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED=${{ secrets.VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED }}

.github/workflows/pr.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,10 @@ 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 }}
118119
VITE_NETWORK_FLAG=${{ secrets.VITE_NETWORK_FLAG }}
119120
VITE_SENTRY_DSN=${{ secrets.VITE_SENTRY_DSN }}
121+
NPMRC_TOKEN=${{ secrets.NPMRC_TOKEN }}
120122
VITE_USERSNAP_SPACE_API_KEY=${{ secrets.VITE_USERSNAP_SPACE_API_KEY }}
121123
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED=${{ secrets.VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED }}
122124
VITE_PDF_API_URL=${{ secrets.VITE_PDF_API_URL }}

govtool/frontend/.env.example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ VITE_BASE_URL=""
33
VITE_METADATA_API_URL=""
44
VITE_NETWORK_FLAG=0
55
VITE_SENTRY_DSN=""
6+
VITE_GTM_ID=""
67
VITE_IS_DEV=true
78
VITE_USERSNAP_SPACE_API_KEY=""
89
VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'

govtool/frontend/Dockerfile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ 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
67
ARG VITE_NETWORK_FLAG=0
78
ARG VITE_SENTRY_DSN
9+
ARG NPMRC_TOKEN
810
ARG VITE_USERSNAP_SPACE_API_KEY
911
ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='true'
1012
ARG VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED='false'
@@ -20,8 +22,10 @@ RUN \
2022
: "${VITE_APP_ENV:?Build argument VITE_APP_ENV is not set}" && \
2123
: "${VITE_BASE_URL:?Build argument VITE_BASE_URL is not set}" && \
2224
: "${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}" && \
2326
: "${VITE_NETWORK_FLAG:?Build argument VITE_NETWORK_FLAG is not set}" && \
2427
: "${VITE_SENTRY_DSN:?Build argument VITE_SENTRY_DSN is not set}" && \
28+
: "${NPMRC_TOKEN:?Build argument NPMRC_TOKEN is not set}" && \
2529
: "${VITE_USERSNAP_SPACE_API_KEY:?Build argument VITE_USERSNAP_SPACE_API_KEY is not set}" && \
2630
: "${VITE_PDF_API_URL:?Build argument VITE_PDF_API_URL is not set}" && \
2731
: "${VITE_OUTCOMES_API_URL:?Build argument VITE_OUTCOMES_API_URL is not set}" && \
@@ -32,6 +36,10 @@ RUN \
3236

3337
WORKDIR /src
3438

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+
3543
COPY package.json package-lock.json ./
3644
COPY patches ./patches
3745

govtool/frontend/Dockerfile.qovery

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ 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
67
ARG VITE_NETWORK_FLAG=0
78
ARG VITE_SENTRY_DSN
9+
ARG NPMRC_TOKEN
810
ARG VITE_USERSNAP_SPACE_API_KEY
911
ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED
1012
ARG VITE_IS_GOVERNANCE_OUTCOMES_PILLAR_ENABLED
@@ -17,6 +19,10 @@ WORKDIR /src
1719

1820
ENV NODE_OPTIONS="--max-old-space-size=4096"
1921

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+
2026
COPY package.json package-lock.json ./
2127
COPY patches ./patches
2228

govtool/frontend/default.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
, incl
33
, VITE_BASE_URL ? "http://localhost"
44
, VITE_IS_DEV ? "true"
5+
, VITE_GTM_ID ? ""
56
, VITE_SENTRY_DSN ? ""
67
, VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED ? ""
78
, VITE_PDF_API_URL ? ""
@@ -31,7 +32,7 @@ let
3132
name = "govtool-website";
3233
src = frontendSrc;
3334
buildInputs = [(pkgs.yarn.override { nodejs = pkgs.nodejs_18;}) nodeModules];
34-
inherit VITE_BASE_URL VITE_IS_DEV VITE_SENTRY_DSN VITE_NETWORK_FLAG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED VITE_PDF_API_URL;
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;
3536
buildPhase = ''
3637
cp -R ${nodeModules}/libexec/@govtool/frontend/node_modules node_modules
3738

govtool/frontend/package-lock.json

Lines changed: 7 additions & 0 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
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",
5354
"react-hook-form": "^7.47.0",
5455
"react-i18next": "^14.0.1",
5556
"react-markdown": "^9.0.1",

0 commit comments

Comments
 (0)