From d20b65ad4e8c931c5d2379eb376004cfddd3e051 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Wed, 18 Sep 2024 17:34:47 +0300 Subject: [PATCH 1/4] Fix prod build SEO disabled --- .github/workflows/charterafrica-deploy-prod.yml | 2 +- Dockerfile | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/charterafrica-deploy-prod.yml b/.github/workflows/charterafrica-deploy-prod.yml index 9b63b3b67..453146543 100644 --- a/.github/workflows/charterafrica-deploy-prod.yml +++ b/.github/workflows/charterafrica-deploy-prod.yml @@ -2,7 +2,7 @@ name: charterAFRICA | Deploy | PROD on: push: - branches: [main] + branches: [fix-prod-buils] # This allows a subsequently queued workflow run to interrupt previous runs concurrency: diff --git a/Dockerfile b/Dockerfile index 48e7c7f45..4310757e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -146,6 +146,7 @@ ARG NEXT_TELEMETRY_DISABLED \ NEXT_PUBLIC_APP_NAME="charterAFRICA" \ NEXT_PUBLIC_APP_URL \ NEXT_PUBLIC_SENTRY_DSN \ + NEXT_PUBLIC_SEO_DISABLED \ # Payload (runtime) MONGO_URL \ # TODO(koech): Standadise naming of Payload Secret. Our options: @@ -167,6 +168,7 @@ COPY apps/charterafrica ./apps/charterafrica/ # When building Next.js app, Next.js needs to connect to local Payload ENV PAYLOAD_PUBLIC_APP_URL=http://localhost:3000 +ENV NEXT_PUBLIC_SEO_DISABLED=${NEXT_PUBLIC_SEO_DISABLED} RUN pnpm --filter "./apps/charterafrica/" build-next # When building Payload app, Payload needs to have final app URL From 6ad039f7f64ac90962cc49d293a6b0486dc45b25 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Wed, 18 Sep 2024 17:37:38 +0300 Subject: [PATCH 2/4] Bump version to build image --- apps/charterafrica/contrib/dokku/Dockerfile | 2 +- apps/charterafrica/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/charterafrica/contrib/dokku/Dockerfile b/apps/charterafrica/contrib/dokku/Dockerfile index 481de4776..5330c5843 100644 --- a/apps/charterafrica/contrib/dokku/Dockerfile +++ b/apps/charterafrica/contrib/dokku/Dockerfile @@ -1 +1 @@ -FROM codeforafrica/charterafrica-ui:0.1.31 +FROM codeforafrica/charterafrica-ui:0.1.32 diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json index 6af5bfbbd..770a52803 100644 --- a/apps/charterafrica/package.json +++ b/apps/charterafrica/package.json @@ -1,6 +1,6 @@ { "name": "charterafrica", - "version": "0.1.31", + "version": "0.1.32", "private": true, "author": "Code for Africa ", "description": "This is the official code for https://charter.africa site", From a54e0bc95b2448bdf5cdfed5b985ab724f1eb02e Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Wed, 18 Sep 2024 17:49:20 +0300 Subject: [PATCH 3/4] Revert building branch --- .github/workflows/charterafrica-deploy-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/charterafrica-deploy-prod.yml b/.github/workflows/charterafrica-deploy-prod.yml index 453146543..9b63b3b67 100644 --- a/.github/workflows/charterafrica-deploy-prod.yml +++ b/.github/workflows/charterafrica-deploy-prod.yml @@ -2,7 +2,7 @@ name: charterAFRICA | Deploy | PROD on: push: - branches: [fix-prod-buils] + branches: [main] # This allows a subsequently queued workflow run to interrupt previous runs concurrency: From 3cb0abad013a8ae63cbd068bac1f5dd524a0ce21 Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Wed, 18 Sep 2024 17:50:21 +0300 Subject: [PATCH 4/4] Bump charterfrica version from 0.1.32 to 0.1.33 --- apps/charterafrica/contrib/dokku/Dockerfile | 2 +- apps/charterafrica/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/charterafrica/contrib/dokku/Dockerfile b/apps/charterafrica/contrib/dokku/Dockerfile index 5330c5843..fceb8357a 100644 --- a/apps/charterafrica/contrib/dokku/Dockerfile +++ b/apps/charterafrica/contrib/dokku/Dockerfile @@ -1 +1 @@ -FROM codeforafrica/charterafrica-ui:0.1.32 +FROM codeforafrica/charterafrica-ui:0.1.33 diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json index 770a52803..ef297b0ce 100644 --- a/apps/charterafrica/package.json +++ b/apps/charterafrica/package.json @@ -1,6 +1,6 @@ { "name": "charterafrica", - "version": "0.1.32", + "version": "0.1.33", "private": true, "author": "Code for Africa ", "description": "This is the official code for https://charter.africa site",