chore: Merge branch 'main' into feat/linechart_hurumap_package

CodeForAfrica · Aug 2, 2024 · 6275a3f · 6275a3f
2 parents b5c5fb0 + 1624a3b
commit 6275a3f
Show file tree

Hide file tree

Showing 75 changed files with 16,065 additions and 4,899 deletions.
diff --git a/.github/workflows/charterafrica-deploy-dev.yml b/.github/workflows/charterafrica-deploy-dev.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Checkout

diff --git a/.github/workflows/charterafrica-deploy-prod.yml b/.github/workflows/charterafrica-deploy-prod.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Checkout

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Checkout

diff --git a/.github/workflows/climatemappedafrica-deploy-dev.yml b/.github/workflows/climatemappedafrica-deploy-dev.yml
@@ -25,7 +25,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Cloning repo

diff --git a/...orkflows/codeforafrica-deploy-dev-app.yml → ...ub/workflows/codeforafrica-deploy-dev.yml b/...orkflows/codeforafrica-deploy-dev-app.yml → ...ub/workflows/codeforafrica-deploy-dev.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Cloning repo

diff --git a/.github/workflows/codeforafrica-deploy-prod.yml b/.github/workflows/codeforafrica-deploy-prod.yml
@@ -24,7 +24,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Checkout

diff --git a/.github/workflows/codeforafrica-deploy-review-app.yml b/.github/workflows/codeforafrica-deploy-review-app.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     if: github.event_name == 'pull_request' && github.event.action != 'closed'
     steps:

diff --git a/.github/workflows/dependabot_lint_format.yml b/.github/workflows/dependabot_lint_format.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:

diff --git a/.github/workflows/pesayetu-deploy-dev.yml b/.github/workflows/pesayetu-deploy-dev.yml
@@ -26,7 +26,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Cloning repo

diff --git a/.github/workflows/release-prod.yml b/.github/workflows/release-prod.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Checkout

diff --git a/.github/workflows/roboshield-deploy-dev.yml b/.github/workflows/roboshield-deploy-dev.yml
@@ -26,33 +26,33 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
-      - name: Cloning repo
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           path: /tmp/.buildx-cache
           restore-keys: |
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           build-args: |
             MONGO_URL=${{ secrets.ROBOSHIELD_MONGO_URL }}

diff --git a/.github/workflows/roboshield-deploy-prod.yml b/.github/workflows/roboshield-deploy-prod.yml
@@ -3,10 +3,6 @@ name: RoboShield | Deploy | PROD
 on:
   push:
     branches: [main]
-    paths:
-      - "apps/roboshield/**"
-      - "Dockerfile"
-      - ".github/workflows/roboshield-deploy-prod.yml"
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref }}"
@@ -27,11 +23,11 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
-      - name: Cloning repo
-        uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup Node.js
@@ -47,24 +43,28 @@ jobs:
           file-name: "${{ env.VERSION_FILE_NAME }}"
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        if: steps.version-check.outputs.changed == 'true'
+        uses: docker/setup-buildx-action@v3
 
       - name: Cache Docker layers
-        uses: actions/cache@v3
+        if: steps.version-check.outputs.changed == 'true'
+        uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-buildx-${{ github.sha }}
           path: /tmp/.buildx-cache
           restore-keys: |
             ${{ runner.os }}-buildx-
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        if: steps.version-check.outputs.changed == 'true'
+        uses: docker/login-action@v3
         with:
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@v3
+        if: steps.version-check.outputs.changed == 'true'
+        uses: docker/build-push-action@v5
         with:
           build-args: |
             MONGO_URL=${{ secrets.ROBOSHIELD_MONGO_URL }}
@@ -87,11 +87,13 @@ jobs:
       # https://github.com/docker/build-push-action/issues/252
       # https://github.com/moby/buildkit/issues/1896
       - name: Move cache
+        if: steps.version-check.outputs.changed == 'true'
         run: |
           rm -rf /tmp/.buildx-cache
           mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
       - name: Push to Dokku
+        if: steps.version-check.outputs.changed == 'true'
         uses: dokku/[email protected]
         with:
           git_remote_url: ${{ env.DOKKU_REMOTE_URL }}/${{ env.APP_NAME }}

diff --git a/.github/workflows/vpnmanager-deploy-dev.yml b/.github/workflows/vpnmanager-deploy-dev.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [20.14]
+        node-version: [20.16]
         os: [ubuntu-latest]
     steps:
       - name: Checkout