Merge branch 'main' into develop

unicefkenya · Sep 20, 2024 · 2430541 · 2430541
2 parents 3d9fd0d + 73afd54
commit 2430541
Show file tree

Hide file tree

Showing 9 changed files with 862 additions and 367 deletions.
diff --git a/.github/composite-actions/ssh-docker-compose/action.yml b/.github/composite-actions/ssh-docker-compose/action.yml
@@ -19,6 +19,9 @@ inputs:
   docker-compose-file-frontend-build:
     description: 'Docker compose for frontend build file location'
     required: true
+  docker-compose-file-documentation-build:
+    description: 'Docker compose for documentation build file location'
+    required: true
   ci_commit:
     description: 'Commit ID'
     required: true
@@ -34,6 +37,10 @@ runs:
       run: .github/composite-actions/ssh-docker-compose/git-pull.sh ${{ inputs.server-ip }} ${{ inputs.server-ssh-port }} ${{ inputs.server-ssh-user }}
       shell: bash
 
+    - name: Rebuild Documentation
+      run: .github/composite-actions/ssh-docker-compose/documentation-build.sh ${{ inputs.server-ip }} ${{ inputs.server-ssh-port }} ${{ inputs.server-ssh-user }} ${{ inputs.docker-compose-file-documentation-build }} ${{ inputs.ci_commit }}
+      shell: bash
+
     - name: Rebuild Frontend
       run: .github/composite-actions/ssh-docker-compose/frontend-build.sh ${{ inputs.server-ip }} ${{ inputs.server-ssh-port }} ${{ inputs.server-ssh-user }} ${{ inputs.docker-compose-file-frontend-build }} ${{ inputs.ci_commit }}
       shell: bash

diff --git a/.github/composite-actions/ssh-docker-compose/documentation-build.sh b/.github/composite-actions/ssh-docker-compose/documentation-build.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -eu
+
+# ${1} for Server IP
+# ${2} for Server Port
+# ${3} for Server User
+# ${4} for Dockerfile location
+
+server_ip="${1}"
+server_port="${2}"
+server_user="${3}"
+docker_compose_file="${4}"
+ci_commit="${5}"
+
+ssh -i priv.key -o BatchMode=yes \
+    -p "${server_port}" \
+    -o UserKnownHostsFile=/dev/null \
+    -o StrictHostKeyChecking=no \
+    "${server_user}"@"${server_ip}" "cd src/deploy && CI_COMMIT=${ci_commit} docker compose -f ${docker_compose_file} up --build"
diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml
@@ -30,6 +30,7 @@ jobs:
           server-ssh-user:  ${{ secrets.SERVER_SSH_USER }}
           docker-compose-file: ${{ secrets.DOCKER_COMPOSE_FILE }}
           docker-compose-file-frontend-build: ${{ secrets.DOCKER_COMPOSE_FILE_FRONTEND_BUILD }}
+          docker-compose-file-documentation-build: ${{ secrets.DOCKER_COMPOSE_FILE_DOCUMENTATION_BUILD }}
           ci_commit: ${{ env.COMMIT_SHORT_SHA }}
 
   mobile-app-release:

diff --git a/app/app.json b/app/app.json
@@ -32,20 +32,6 @@
       }
     },
     "owner": "akvo",
-    "backgroundFetch": {
-      "jobs": [
-        {
-          "jobName": "sync-form-version",
-          "minimumInterval": 3600,
-          "enabled": true
-        },
-        {
-          "jobName": "sync-form-submission",
-          "minimumInterval": 1,
-          "enabled": true
-        }
-      ]
-    },
     "plugins": [
       [
         "sentry-expo",
@@ -56,6 +42,19 @@
           "project": "rtmis-mobile",
           "setCommits": true
         }
+      ],
+      [
+        "expo-build-properties",
+        {
+          "android": {
+            "compileSdkVersion": 34,
+            "targetSdkVersion": 34,
+            "buildToolsVersion": "34.0.0"
+          },
+          "ios": {
+            "deploymentTarget": "13.4"
+          }
+        }
       ]
     ],
     "hooks": {

diff --git a/app/eas.json b/app/eas.json
@@ -1,6 +1,6 @@
 {
   "cli": {
-    "version": ">= 3.15.0",
+    "version": ">= 12.4.1",
     "appVersionSource": "local"
   },
   "build": {

diff --git a/app/package.json b/app/package.json
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@react-native-community/datetimepicker": "7.2.0",
-    "@react-native-community/netinfo": "^9.3.10",
+    "@react-native-community/netinfo": "9.3.10",
     "@react-navigation/native": "^6.1.6",
     "@react-navigation/native-stack": "^6.9.12",
     "@rneui/base": "^4.0.0-rc.7",
@@ -29,6 +29,7 @@
     "expo-application": "~5.3.0",
     "expo-asset": "~8.10.1",
     "expo-background-fetch": "~11.3.0",
+    "expo-build-properties": "~0.8.3",
     "expo-constants": "~14.4.2",
     "expo-crypto": "~12.4.1",
     "expo-device": "~5.4.0",
@@ -46,7 +47,7 @@
     "prop-types": "^15.8.1",
     "pullstate": "^1.25.0",
     "react": "18.2.0",
-    "react-native": "0.72.6",
+    "react-native": "0.72.10",
     "react-native-background-actions": "^3.0.1",
     "react-native-element-dropdown": "^2.9.0",
     "react-native-material-menu": "^2.0.0",
@@ -66,7 +67,7 @@
     "babel-jest": "^29.5.0",
     "babel-preset-react-native": "^4.0.1",
     "coveralls": "^3.1.1",
-    "eas-cli": "^3.15.0",
+    "eas-cli": "^12.4.1",
     "eslint": "^8.42.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-prettier": "^8.8.0",