Merge branch 'medic:master' into master

livinggoods · Mar 19, 2024 · d196c53 · d196c53
2 parents b5e8d91 + 544d0d2
commit d196c53
Show file tree

Hide file tree

Showing 202 changed files with 5,402 additions and 1,585 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -7,7 +7,7 @@ jobs:
   skip_check:
 
     name: Skip Check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     outputs:
       should_skip: ${{ steps.skip_check.outputs.should_skip }}
     steps:
@@ -21,7 +21,7 @@ jobs:
   build:
 
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: skip_check
     if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
     steps:
@@ -31,11 +31,11 @@ jobs:
       with:
         submodules: true
 
-    - name: Set up Java 11
+    - name: Set up Java 17
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
 
     - name: Test Bash Keystores scripts
       run: make test-bash-keystore
@@ -47,7 +47,7 @@ jobs:
       if: ${{ env.ANDROID_SECRETS_KEY }}
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
 
     - name: Set up Fastlane
       if: ${{ env.ANDROID_SECRETS_KEY }}
@@ -75,7 +75,7 @@ jobs:
   instrumentation-tests:
 
     name: Instrumentation tests
-    runs-on: macos-latest
+    runs-on: ubuntu-22.04
     needs: skip_check
     if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
     steps:
@@ -85,11 +85,17 @@ jobs:
       with:
         submodules: true
 
-    - name: Set up Java 11
+    - name: Set up Java 17
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
+
+    - name: Enable KVM
+      run: |
+        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+        sudo udevadm control --reload-rules
+        sudo udevadm trigger --name-match=kvm
 
     - name: Gradle cache
       uses: actions/cache@v2
@@ -106,13 +112,14 @@ jobs:
         path: |
           ~/.android/avd/*
           ~/.android/adb*
-        key: avd-29-default
+        key: avd-34-default
 
     - name: Create AVD and generate snapshot for caching
       if: steps.avd-cache.outputs.cache-hit != 'true'
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 29
+        api-level: 34
+        arch: x86_64
         target: default
         force-avd-creation: false
         emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
@@ -125,7 +132,8 @@ jobs:
     - name: Run test-ui on unbranded
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 29
+        api-level: 34
+        arch: x86_64
         target: default
         force-avd-creation: false
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
@@ -134,21 +142,13 @@ jobs:
     - name: Run test-ui on gamma
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 29
+        api-level: 34
+        arch: x86_64
         target: default
         force-avd-creation: false
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
         script: make test-ui-gamma
 
-    - name: Run test-ui-url
-      uses: reactivecircus/android-emulator-runner@v2
-      with:
-        api-level: 29
-        target: default
-        force-avd-creation: false
-        emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-        script: make test-ui-url
-
     - name: Archive Results
       uses: actions/upload-artifact@v2
       with:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   build:
     name: Build
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
 
     - name: Checkout
@@ -22,16 +22,16 @@ jobs:
     - name: Set release version
       run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
 
-    - name: Set up Java 11
+    - name: Set up Java 17
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
-        java-version: '11'
+        java-version: '17'
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
 
     - name: Set up Fastlane
       run: gem install fastlane --no-document --quiet
@@ -71,6 +71,11 @@ jobs:
       with:
         lane: build
         options: '{ "flavor": "medicmobilegamma" }'
+    - name: Assemble gamma training
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "medicmobilegamma_training" }'
     # demo app is disabled for now
     #- name: Assemble demo
     #  uses: maierj/[email protected]
@@ -192,11 +197,6 @@ jobs:
       with:
         lane: build
         options: '{ "flavor": "trippleeighty" }'
-    - name: Assemble unbranded_test
-      uses: maierj/[email protected]
-      with:
-        lane: build
-        options: '{ "flavor": "unbranded_test" }'
     - name: Assemble vhw_burundi
       uses: maierj/[email protected]
       with:
@@ -222,6 +222,39 @@ jobs:
       with:
         lane: build
         options: '{ "flavor": "itech_malawi" }'
+
+    - name: Unpack secrets cares_malawi_kch
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_CARES_MALAWI_KCH }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_CARES_MALAWI_KCH }}
+      run: make org=cares_malawi_kch keydec
+
+    - name: Assemble cares_malawi_kch
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "cares_malawi_kch" }'
+      env:
+        ANDROID_KEYSTORE_PATH: cares_malawi_kch.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_CARES_MALAWI_KCH }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_CARES_MALAWI_KCH }}
+
+    - name: Unpack secrets cares_malawi_mpc
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_CARES_MALAWI_MPC }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_CARES_MALAWI_MPC }}
+      run: make org=cares_malawi_mpc keydec
+
+    - name: Assemble cares_malawi_mpc
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "cares_malawi_mpc" }'
+      env:
+        ANDROID_KEYSTORE_PATH: cares_malawi_mpc.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_CARES_MALAWI_MPC }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_CARES_MALAWI_MPC }}
+
     - name: Assemble alerte_niger
       uses: maierj/[email protected]
       with:
@@ -231,6 +264,33 @@ jobs:
         ANDROID_KEYSTORE_PATH: alerte_niger.keystore
         ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_ALERTE_NIGER }}
         ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_ALERTE_NIGER }}
+
+    - name: Unpack secrets moh_kenya_echis
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_MOH_KENYA_ECHIS }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_MOH_KENYA_ECHIS }}
+      run: make org=moh_kenya_echis keydec
+
+    - name: Assemble moh_kenya_echis
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "moh_kenya_echis" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_kenya_echis.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_KENYA_ECHIS }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_KENYA_ECHIS }}
+
+    - name: Bundle moh_kenya_echis
+      uses: maierj/[email protected]
+      with:
+        lane: bundle
+        options: '{ "flavor": "moh_kenya_echis" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_kenya_echis.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_KENYA_ECHIS }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_KENYA_ECHIS }}
+
     - name: Assemble chis_ne
       uses: maierj/[email protected]
       with:
@@ -280,6 +340,84 @@ jobs:
         ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_CHT_RCI }}
         ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_CHT_RCI }}
 
+    - name: Unpack secrets moh_mali_chw
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_MOH_MALI_CHW }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_MOH_MALI_CHW }}
+      run: make org=moh_mali_chw keydec
+
+    - name: Assemble moh_mali_chw
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "moh_mali_chw" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_mali_chw.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_MALI_CHW }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_MALI_CHW }}
+
+    - name: Bundle moh_mali_chw
+      uses: maierj/[email protected]
+      with:
+        lane: bundle
+        options: '{ "flavor": "moh_mali_chw" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_mali_chw.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_MALI_CHW }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_MALI_CHW }}
+
+    - name: Unpack secrets moh_niger_chw
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_MOH_NIGER_CHW }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_MOH_NIGER_CHW }}
+      run: make org=moh_niger_chw keydec
+
+    - name: Assemble moh_niger_chw
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "moh_niger_chw" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_niger_chw.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_NIGER_CHW }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_NIGER_CHW }}
+
+    - name: Bundle moh_niger_chw
+      uses: maierj/[email protected]
+      with:
+        lane: bundle
+        options: '{ "flavor": "moh_niger_chw" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_niger_chw.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_NIGER_CHW }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_NIGER_CHW }}
+
+    - name: Unpack secrets moh_togo_uat
+      env:
+        ANDROID_SECRETS_KEY: ${{ secrets.ANDROID_SECRETS_KEY_MOH_TOGO_UAT }}
+        ANDROID_SECRETS_IV: ${{ secrets.ANDROID_SECRETS_IV_MOH_TOGO_UAT }}
+      run: make org=moh_togo_uat keydec
+
+    - name: Assemble moh_togo_uat
+      uses: maierj/[email protected]
+      with:
+        lane: build
+        options: '{ "flavor": "moh_togo_uat" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_togo_uat.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_TOGO_UAT }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_TOGO_UAT }}
+
+    - name: Bundle moh_togo_uat
+      uses: maierj/[email protected]
+      with:
+        lane: bundle
+        options: '{ "flavor": "moh_togo_uat" }'
+      env:
+        ANDROID_KEYSTORE_PATH: moh_togo_uat.keystore
+        ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD_MOH_TOGO_UAT }}
+        ANDROID_KEY_PASSWORD: ${{ secrets.ANDROID_KEY_PASSWORD_MOH_TOGO_UAT }}
+
     - name: GitHub release
       uses: softprops/action-gh-release@v1
       if: startsWith(github.ref, 'refs/tags/')