From 8fbd3088339c742fe0aebfb5c04247bbbacbb34a Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Tue, 8 Oct 2024 09:05:31 +0300 Subject: [PATCH 01/18] chore: add ARM image build support --- .github/workflows/charterafrica-deploy-dev.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/charterafrica-deploy-dev.yml b/.github/workflows/charterafrica-deploy-dev.yml index 6d100778c..e91e409e8 100644 --- a/.github/workflows/charterafrica-deploy-dev.yml +++ b/.github/workflows/charterafrica-deploy-dev.yml @@ -2,7 +2,9 @@ name: charterAFRICA | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/charterafrica/**" - "Dockerfile" @@ -32,9 +34,14 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 + - name: Cache Docker layers uses: actions/cache@v4 with: @@ -63,6 +70,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" From 2db75212727d6a81ad2799a6d705af7ca3e6106f Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Tue, 8 Oct 2024 11:50:18 +0300 Subject: [PATCH 02/18] fix: formatting with prettier --- .github/workflows/charterafrica-deploy-dev.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/charterafrica-deploy-dev.yml b/.github/workflows/charterafrica-deploy-dev.yml index e91e409e8..e762a1641 100644 --- a/.github/workflows/charterafrica-deploy-dev.yml +++ b/.github/workflows/charterafrica-deploy-dev.yml @@ -41,7 +41,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Cache Docker layers uses: actions/cache@v4 with: From 11e285d93a0b07845b5a5285a3d14e1b58c32d44 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Tue, 8 Oct 2024 14:33:58 +0300 Subject: [PATCH 03/18] chore: add ARM image build support --- .github/workflows/civicsignalblog-deploy-prod.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/civicsignalblog-deploy-prod.yml b/.github/workflows/civicsignalblog-deploy-prod.yml index 8ae44bbdb..e46bb6b77 100644 --- a/.github/workflows/civicsignalblog-deploy-prod.yml +++ b/.github/workflows/civicsignalblog-deploy-prod.yml @@ -31,6 +31,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + # Set up Node since it's required by version-check # https://github.com/EndBug/version-check#github-workflow - name: Setup Node.js @@ -84,6 +88,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" From 2b2f7d435a4de044d7c5f94d5981d284d65c59b2 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Tue, 8 Oct 2024 14:54:22 +0300 Subject: [PATCH 04/18] chore: add ARM Image build support --- .github/workflows/climatemappedafrica-deploy-dev.yml | 9 ++++++++- .github/workflows/codeforafrica-deploy-dev.yml | 9 ++++++++- .github/workflows/pesayetu-deploy-dev.yml | 9 ++++++++- .github/workflows/roboshield-deploy-dev.yml | 9 ++++++++- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml index 804cbaede..cd5ee3ca3 100644 --- a/.github/workflows/climatemappedafrica-deploy-dev.yml +++ b/.github/workflows/climatemappedafrica-deploy-dev.yml @@ -2,7 +2,9 @@ name: Climate Mapped Africa | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/climatemappedafrica/**" - "Dockerfile" @@ -33,6 +35,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -58,6 +64,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 target: climatemappedafrica-runner push: true tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}" diff --git a/.github/workflows/codeforafrica-deploy-dev.yml b/.github/workflows/codeforafrica-deploy-dev.yml index 44b7d919b..c84bba404 100644 --- a/.github/workflows/codeforafrica-deploy-dev.yml +++ b/.github/workflows/codeforafrica-deploy-dev.yml @@ -2,7 +2,9 @@ name: Code for Africa | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/codeforafrica/**" - "Dockerfile" @@ -34,6 +36,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -66,6 +72,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/.github/workflows/pesayetu-deploy-dev.yml b/.github/workflows/pesayetu-deploy-dev.yml index a9a268c18..a9f7c70aa 100644 --- a/.github/workflows/pesayetu-deploy-dev.yml +++ b/.github/workflows/pesayetu-deploy-dev.yml @@ -2,7 +2,9 @@ name: Pesayetu | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/pesayetu/**" - "Dockerfile.pesayetu" @@ -34,6 +36,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -68,6 +74,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}" target: pesayetu-runner diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index 104f05e56..b2a0754ce 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -2,7 +2,9 @@ name: RoboShield | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/roboshield/**" - "Dockerfile" @@ -34,6 +36,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -65,6 +71,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" From 7dec0121ca85d03c7bddd290e60edaacdbdeecce Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Tue, 8 Oct 2024 21:40:47 +0300 Subject: [PATCH 05/18] fix: revert ARM image support --- .github/workflows/climatemappedafrica-deploy-dev.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml index cd5ee3ca3..804cbaede 100644 --- a/.github/workflows/climatemappedafrica-deploy-dev.yml +++ b/.github/workflows/climatemappedafrica-deploy-dev.yml @@ -2,9 +2,7 @@ name: Climate Mapped Africa | Deploy | DEV on: push: - branches: - - main - - chore/build-arm-image + branches: [main] paths: - "apps/climatemappedafrica/**" - "Dockerfile" @@ -35,10 +33,6 @@ jobs: with: fetch-depth: 0 - # Add support for more platforms with QEMU (optional) - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -64,7 +58,6 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . - platforms: linux/amd64,linux/arm64 target: climatemappedafrica-runner push: true tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}" From 67504f69cdbb93339ed67bd034d1bf9b209bc6b5 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 10:00:10 +0300 Subject: [PATCH 06/18] fix: remove unwanted branch --- .github/workflows/charterafrica-deploy-dev.yml | 4 +--- .github/workflows/charterafrica-deploy-prod.yml | 4 ++++ .github/workflows/codeforafrica-deploy-dev.yml | 4 +--- .github/workflows/codeforafrica-deploy-prod.yml | 5 +++++ .github/workflows/pesayetu-deploy-dev.yml | 4 +--- .github/workflows/roboshield-deploy-dev.yml | 4 +--- .github/workflows/roboshield-deploy-prod.yml | 6 ++++++ 7 files changed, 19 insertions(+), 12 deletions(-) diff --git a/.github/workflows/charterafrica-deploy-dev.yml b/.github/workflows/charterafrica-deploy-dev.yml index e762a1641..989c3ce1a 100644 --- a/.github/workflows/charterafrica-deploy-dev.yml +++ b/.github/workflows/charterafrica-deploy-dev.yml @@ -2,9 +2,7 @@ name: charterAFRICA | Deploy | DEV on: push: - branches: - - main - - chore/build-arm-image + branches: [main] paths: - "apps/charterafrica/**" - "Dockerfile" diff --git a/.github/workflows/charterafrica-deploy-prod.yml b/.github/workflows/charterafrica-deploy-prod.yml index 03fa6cb15..d2e83daf3 100644 --- a/.github/workflows/charterafrica-deploy-prod.yml +++ b/.github/workflows/charterafrica-deploy-prod.yml @@ -30,6 +30,9 @@ jobs: with: fetch-depth: 0 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + # Set up Node since it's required by version-check # https://github.com/EndBug/version-check#github-workflow - name: Setup Node.js @@ -92,6 +95,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/.github/workflows/codeforafrica-deploy-dev.yml b/.github/workflows/codeforafrica-deploy-dev.yml index c84bba404..9f6b28eb4 100644 --- a/.github/workflows/codeforafrica-deploy-dev.yml +++ b/.github/workflows/codeforafrica-deploy-dev.yml @@ -2,9 +2,7 @@ name: Code for Africa | Deploy | DEV on: push: - branches: - - main - - chore/build-arm-image + branches: [main] paths: - "apps/codeforafrica/**" - "Dockerfile" diff --git a/.github/workflows/codeforafrica-deploy-prod.yml b/.github/workflows/codeforafrica-deploy-prod.yml index 7be2dd21c..3e500c526 100644 --- a/.github/workflows/codeforafrica-deploy-prod.yml +++ b/.github/workflows/codeforafrica-deploy-prod.yml @@ -32,6 +32,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + # Set up Node since it's required by version-check # https://github.com/EndBug/version-check#github-workflow - name: Setup Node.js @@ -87,6 +91,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/.github/workflows/pesayetu-deploy-dev.yml b/.github/workflows/pesayetu-deploy-dev.yml index a9f7c70aa..de50bf750 100644 --- a/.github/workflows/pesayetu-deploy-dev.yml +++ b/.github/workflows/pesayetu-deploy-dev.yml @@ -2,9 +2,7 @@ name: Pesayetu | Deploy | DEV on: push: - branches: - - main - - chore/build-arm-image + branches: [main] paths: - "apps/pesayetu/**" - "Dockerfile.pesayetu" diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index b2a0754ce..11a50fc0a 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -2,9 +2,7 @@ name: RoboShield | Deploy | DEV on: push: - branches: - - main - - chore/build-arm-image + branches: [main] paths: - "apps/roboshield/**" - "Dockerfile" diff --git a/.github/workflows/roboshield-deploy-prod.yml b/.github/workflows/roboshield-deploy-prod.yml index 1a96f8bd7..f4b0bd590 100644 --- a/.github/workflows/roboshield-deploy-prod.yml +++ b/.github/workflows/roboshield-deploy-prod.yml @@ -30,6 +30,11 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 0 + + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Setup Node.js uses: actions/setup-node@v4 with: @@ -77,6 +82,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" From d464701f2e3ab26cf62e214fcff60785124d63f8 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 11:02:53 +0300 Subject: [PATCH 07/18] chore: add test branch --- .github/workflows/charterafrica-deploy-prod.yml | 4 ---- .github/workflows/codeforafrica-deploy-dev.yml | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/charterafrica-deploy-prod.yml b/.github/workflows/charterafrica-deploy-prod.yml index d2e83daf3..03fa6cb15 100644 --- a/.github/workflows/charterafrica-deploy-prod.yml +++ b/.github/workflows/charterafrica-deploy-prod.yml @@ -30,9 +30,6 @@ jobs: with: fetch-depth: 0 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - # Set up Node since it's required by version-check # https://github.com/EndBug/version-check#github-workflow - name: Setup Node.js @@ -95,7 +92,6 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . - platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/.github/workflows/codeforafrica-deploy-dev.yml b/.github/workflows/codeforafrica-deploy-dev.yml index 9f6b28eb4..c84bba404 100644 --- a/.github/workflows/codeforafrica-deploy-dev.yml +++ b/.github/workflows/codeforafrica-deploy-dev.yml @@ -2,7 +2,9 @@ name: Code for Africa | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/codeforafrica/**" - "Dockerfile" From 73fb2277253dd3a31f0b861b1a26cd0b97d045c1 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 11:35:16 +0300 Subject: [PATCH 08/18] chore: bump image version --- apps/codeforafrica/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/codeforafrica/package.json b/apps/codeforafrica/package.json index 7cd1afa60..d876d1343 100644 --- a/apps/codeforafrica/package.json +++ b/apps/codeforafrica/package.json @@ -1,6 +1,6 @@ { "name": "codeforafrica", - "version": "1.0.56", + "version": "1.0.57", "private": true, "author": "Code for Africa ", "description": "This is the main CFA site.", From 1237e01bc3ef12eeff8ec08d02bc9f5a2376037f Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 12:03:54 +0300 Subject: [PATCH 09/18] chore: add test branch in prod workflow --- .github/workflows/codeforafrica-deploy-prod.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeforafrica-deploy-prod.yml b/.github/workflows/codeforafrica-deploy-prod.yml index 3e500c526..3073603ff 100644 --- a/.github/workflows/codeforafrica-deploy-prod.yml +++ b/.github/workflows/codeforafrica-deploy-prod.yml @@ -2,7 +2,9 @@ name: Code for Africa | Deploy | PROD on: push: - branches: [main] + branches: + - main + - chore/build-arm-image # This allows a subsequently queued workflow run to interrupt previous runs concurrency: From 1bd2fe84c625b717c3c9c44d98725f0777fb0c64 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 12:20:33 +0300 Subject: [PATCH 10/18] chore: bump codeforafrica to 1.0.58 --- apps/codeforafrica/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/codeforafrica/package.json b/apps/codeforafrica/package.json index d876d1343..1ce361834 100644 --- a/apps/codeforafrica/package.json +++ b/apps/codeforafrica/package.json @@ -1,6 +1,6 @@ { "name": "codeforafrica", - "version": "1.0.57", + "version": "1.0.58", "private": true, "author": "Code for Africa ", "description": "This is the main CFA site.", From b5ce7c49fd0ef1f412d9e2598a41a041bc26c676 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 12:57:31 +0300 Subject: [PATCH 11/18] chore: bump charterafrica to 0.1.34 --- .github/workflows/charterafrica-deploy-dev.yml | 4 +++- .github/workflows/charterafrica-deploy-prod.yml | 5 ++++- apps/charterafrica/package.json | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/charterafrica-deploy-dev.yml b/.github/workflows/charterafrica-deploy-dev.yml index 989c3ce1a..e762a1641 100644 --- a/.github/workflows/charterafrica-deploy-dev.yml +++ b/.github/workflows/charterafrica-deploy-dev.yml @@ -2,7 +2,9 @@ name: charterAFRICA | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/charterafrica/**" - "Dockerfile" diff --git a/.github/workflows/charterafrica-deploy-prod.yml b/.github/workflows/charterafrica-deploy-prod.yml index 03fa6cb15..4e2632913 100644 --- a/.github/workflows/charterafrica-deploy-prod.yml +++ b/.github/workflows/charterafrica-deploy-prod.yml @@ -2,7 +2,9 @@ name: charterAFRICA | Deploy | PROD on: push: - branches: [main] + branches: + - main + - chore/build-arm-image # This allows a subsequently queued workflow run to interrupt previous runs concurrency: @@ -92,6 +94,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json index ef297b0ce..eaa44f456 100644 --- a/apps/charterafrica/package.json +++ b/apps/charterafrica/package.json @@ -1,6 +1,6 @@ { "name": "charterafrica", - "version": "0.1.33", + "version": "0.1.34", "private": true, "author": "Code for Africa ", "description": "This is the official code for https://charter.africa site", From 6ad4a21191bb7cffd24e670c5445eb696af31982 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 14:31:35 +0300 Subject: [PATCH 12/18] chore: bump version in civicsignal, roboshield, vpnmanager --- .github/workflows/civicsignalblog-deploy-prod.yml | 4 +++- .github/workflows/roboshield-deploy-dev.yml | 5 ++++- .github/workflows/roboshield-deploy-prod.yml | 4 +++- .github/workflows/vpnmanager-deploy-dev.yml | 9 ++++++++- apps/civicsignalblog/package.json | 2 +- apps/roboshield/package.json | 2 +- apps/vpnmanager/package.json | 2 +- 7 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.github/workflows/civicsignalblog-deploy-prod.yml b/.github/workflows/civicsignalblog-deploy-prod.yml index e46bb6b77..04d472ddb 100644 --- a/.github/workflows/civicsignalblog-deploy-prod.yml +++ b/.github/workflows/civicsignalblog-deploy-prod.yml @@ -2,7 +2,9 @@ name: CivicSignal Blog | Deploy | PROD on: push: - branches: [main] + branches: + - main + - chore/build-arm-image # This allows a subsequently queued workflow run to interrupt previous runs concurrency: diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml index 11a50fc0a..043f896bc 100644 --- a/.github/workflows/roboshield-deploy-dev.yml +++ b/.github/workflows/roboshield-deploy-dev.yml @@ -2,7 +2,10 @@ name: RoboShield | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image + paths: - "apps/roboshield/**" - "Dockerfile" diff --git a/.github/workflows/roboshield-deploy-prod.yml b/.github/workflows/roboshield-deploy-prod.yml index f4b0bd590..bbe908eba 100644 --- a/.github/workflows/roboshield-deploy-prod.yml +++ b/.github/workflows/roboshield-deploy-prod.yml @@ -2,7 +2,9 @@ name: RoboShield | Deploy | PROD on: push: - branches: [main] + branches: + - main + - chore/build-arm-image concurrency: group: "${{ github.workflow }} @ ${{ github.ref }}" diff --git a/.github/workflows/vpnmanager-deploy-dev.yml b/.github/workflows/vpnmanager-deploy-dev.yml index a157f58d5..696df5dc3 100644 --- a/.github/workflows/vpnmanager-deploy-dev.yml +++ b/.github/workflows/vpnmanager-deploy-dev.yml @@ -2,7 +2,9 @@ name: VPN Manager | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/vpnmanager/**" - "Dockerfile.vpnmanager" @@ -31,6 +33,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -60,6 +66,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 push: true secrets: | "sentry_auth_token=${{ secrets.SENTRY_AUTH_TOKEN }}" diff --git a/apps/civicsignalblog/package.json b/apps/civicsignalblog/package.json index c6d764d71..2daef8d7d 100644 --- a/apps/civicsignalblog/package.json +++ b/apps/civicsignalblog/package.json @@ -1,6 +1,6 @@ { "name": "civicsignalblog", - "version": "0.1.13", + "version": "0.1.14", "private": true, "author": "Code for Africa ", "description": "This is the (temporary) CivicSignal blog", diff --git a/apps/roboshield/package.json b/apps/roboshield/package.json index 5dc0e0f7e..67223f6c9 100644 --- a/apps/roboshield/package.json +++ b/apps/roboshield/package.json @@ -1,6 +1,6 @@ { "name": "roboshield", - "version": "0.1.13", + "version": "0.1.14", "private": true, "scripts": { "build-server": "tsc --project tsconfig.server.json", diff --git a/apps/vpnmanager/package.json b/apps/vpnmanager/package.json index f28a9cb84..965b45f47 100644 --- a/apps/vpnmanager/package.json +++ b/apps/vpnmanager/package.json @@ -1,6 +1,6 @@ { "name": "vpnmanager", - "version": "0.1.0", + "version": "0.1.1", "private": true, "scripts": { "dev": "next dev", From 7db4b4433ef7daeb2932168e7d64c258fab8af0c Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Wed, 9 Oct 2024 22:51:45 +0300 Subject: [PATCH 13/18] chore: bump civicsignal blog version --- apps/civicsignalblog/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/civicsignalblog/package.json b/apps/civicsignalblog/package.json index 2daef8d7d..65a05888d 100644 --- a/apps/civicsignalblog/package.json +++ b/apps/civicsignalblog/package.json @@ -1,6 +1,6 @@ { "name": "civicsignalblog", - "version": "0.1.14", + "version": "0.1.15", "private": true, "author": "Code for Africa ", "description": "This is the (temporary) CivicSignal blog", From 4588fc73e5daed188be44f185beb6583ce77cd21 Mon Sep 17 00:00:00 2001 From: Clemence Kyara Date: Fri, 11 Oct 2024 12:28:07 +0300 Subject: [PATCH 14/18] =?UTF-8?q?Bump=20civicsignalblog=20version:=200.1.1?= =?UTF-8?q?5=20=E2=86=92=20=200.1.16?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/civicsignalblog/contrib/dokku/Dockerfile | 2 +- apps/civicsignalblog/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/civicsignalblog/contrib/dokku/Dockerfile b/apps/civicsignalblog/contrib/dokku/Dockerfile index 9b020b544..069d08072 100644 --- a/apps/civicsignalblog/contrib/dokku/Dockerfile +++ b/apps/civicsignalblog/contrib/dokku/Dockerfile @@ -1 +1 @@ -FROM codeforafrica/codeforafrica-ui:0.1.13 +FROM codeforafrica/codeforafrica-ui:0.1.16 diff --git a/apps/civicsignalblog/package.json b/apps/civicsignalblog/package.json index 0011bbb3e..c83915638 100644 --- a/apps/civicsignalblog/package.json +++ b/apps/civicsignalblog/package.json @@ -1,6 +1,6 @@ { "name": "civicsignalblog", - "version": "0.1.15", + "version": "0.1.16", "private": true, "author": "Code for Africa ", "description": "This is the (temporary) CivicSignal blog", From 2c49d6f01d784cc58d42b8f6182166a7db3bc4d1 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Mon, 14 Oct 2024 13:14:25 +0300 Subject: [PATCH 15/18] chore: add multiplatform support on climatemapped --- .github/workflows/climatemappedafrica-deploy-dev.yml | 9 ++++++++- apps/climatemappedafrica/package.json | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml index 804cbaede..cd5ee3ca3 100644 --- a/.github/workflows/climatemappedafrica-deploy-dev.yml +++ b/.github/workflows/climatemappedafrica-deploy-dev.yml @@ -2,7 +2,9 @@ name: Climate Mapped Africa | Deploy | DEV on: push: - branches: [main] + branches: + - main + - chore/build-arm-image paths: - "apps/climatemappedafrica/**" - "Dockerfile" @@ -33,6 +35,10 @@ jobs: with: fetch-depth: 0 + # Add support for more platforms with QEMU (optional) + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 @@ -58,6 +64,7 @@ jobs: cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache-new context: . + platforms: linux/amd64,linux/arm64 target: climatemappedafrica-runner push: true tags: "${{ env.IMAGE_NAME }}:${{ github.sha }}" diff --git a/apps/climatemappedafrica/package.json b/apps/climatemappedafrica/package.json index e5a2e3fd2..a9ff5f979 100644 --- a/apps/climatemappedafrica/package.json +++ b/apps/climatemappedafrica/package.json @@ -1,6 +1,6 @@ { "name": "climatemappedafrica", - "version": "0.0.1", + "version": "0.0.2", "private": true, "author": "Code for Africa ", "description": "Climate Mapped Africa ", From 05eb1258119543794f458c5b2e747d29ad612be4 Mon Sep 17 00:00:00 2001 From: VinneyJ Date: Thu, 17 Oct 2024 09:29:51 +0300 Subject: [PATCH 16/18] chore:bump climatemapped to 0.0.4 --- apps/climatemappedafrica/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/climatemappedafrica/package.json b/apps/climatemappedafrica/package.json index 4f2310186..50032687c 100644 --- a/apps/climatemappedafrica/package.json +++ b/apps/climatemappedafrica/package.json @@ -1,6 +1,6 @@ { "name": "climatemappedafrica", - "version": "0.0.3", + "version": "0.0.4", "private": true, "author": "Code for Africa ", "description": "Climate Mapped Africa ", From 8767b03bbd83eb77826858ee3e8d95264e64552a Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Tue, 18 Feb 2025 11:22:35 +0300 Subject: [PATCH 17/18] Bump charterafrica UI version to 0.1.35 in Dockerfile and package.json --- 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 fceb8357a..2988ff688 100644 --- a/apps/charterafrica/contrib/dokku/Dockerfile +++ b/apps/charterafrica/contrib/dokku/Dockerfile @@ -1 +1 @@ -FROM codeforafrica/charterafrica-ui:0.1.33 +FROM codeforafrica/charterafrica-ui:0.1.35 diff --git a/apps/charterafrica/package.json b/apps/charterafrica/package.json index 96b894ef5..e63a42b55 100644 --- a/apps/charterafrica/package.json +++ b/apps/charterafrica/package.json @@ -1,6 +1,6 @@ { "name": "charterafrica", - "version": "0.1.34", + "version": "0.1.35", "private": true, "author": "Code for Africa ", "description": "This is the official code for https://charter.africa site", From 7d5acd446428838694d3f26f0011a1a0108f0ffc Mon Sep 17 00:00:00 2001 From: Kevin Koech Date: Thu, 20 Feb 2025 14:29:03 +0300 Subject: [PATCH 18/18] Bump climatemapped-africa-ui version to 0.0.5 in Dockerfile and package.json --- apps/climatemappedafrica/contrib/dokku/Dockerfile | 2 +- apps/climatemappedafrica/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/climatemappedafrica/contrib/dokku/Dockerfile b/apps/climatemappedafrica/contrib/dokku/Dockerfile index 3c1919c5c..947995d6c 100644 --- a/apps/climatemappedafrica/contrib/dokku/Dockerfile +++ b/apps/climatemappedafrica/contrib/dokku/Dockerfile @@ -1 +1 @@ -FROM codeforafrica/climatemapped-africa-ui:0.0.1 +FROM codeforafrica/climatemapped-africa-ui:0.0.5 diff --git a/apps/climatemappedafrica/package.json b/apps/climatemappedafrica/package.json index bb09c7d36..e41212d4c 100644 --- a/apps/climatemappedafrica/package.json +++ b/apps/climatemappedafrica/package.json @@ -1,6 +1,6 @@ { "name": "climatemappedafrica", - "version": "0.0.4", + "version": "0.0.5", "private": true, "author": "Code for Africa ", "description": "ClimateMapped Africa",