ci: sync workflow with paramedic (#971)

apache · Aug 12, 2022 · 405468c · 405468c
1 parent a877f62
commit 405468c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 35 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -33,6 +33,7 @@ jobs:
   test:
     name: Android ${{ matrix.versions.android }} Test
     runs-on: macos-latest
+    continue-on-error: true
 
     # hoist configurations to top that are expected to be updated
     env:
@@ -55,39 +56,28 @@ jobs:
     strategy:
       matrix:
         versions:
+          # Test the lowest minimum supported APIs
           - android: 5.1
             android-api: 22
 
-          - android: 6
-            android-api: 23
-
-          - android: 7
-            android-api: 24
-
-          - android: 7.1
-            android-api: 25
-
-          - android: 8
-            android-api: 26
-
-          - android: 8.1
-            android-api: 27
-            system-image-target: default
-
-          - android: 9
-            android-api: 28
-
+          # Test the last 3-4 supported APIs
           - android: 10
             android-api: 29
 
           - android: 11
             android-api: 30
 
+          - android: 12
+            android-api: 31
+
+          - android: 12L
+            android-api: 32
+
     timeout-minutes: 60
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ env.node-version }}
       - uses: actions/setup-java@v3
@@ -112,7 +102,7 @@ jobs:
           npm ci
 
       - name: Run paramedic install
-        if: ${{ endswith(env.repo, '/cordova-paramedic')　!= true }}
+        if: ${{ endswith(env.repo, '/cordova-paramedic') != true }}
         run: npm i -g github:apache/cordova-paramedic
 
       - uses: reactivecircus/android-emulator-runner@5de26e4bd23bf523e8a4b7f077df8bfb8e52b50e

diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -33,6 +33,7 @@ jobs:
   test:
     name: iOS ${{ matrix.versions.ios-version }} Test
     runs-on: ${{ matrix.versions.os-version }}
+    continue-on-error: true
 
     # hoist configurations to top that are expected to be updated
     env:
@@ -49,15 +50,11 @@ jobs:
     strategy:
       matrix:
         versions:
-          - os-version: macos-10.15
-            ios-version: 12.x
-            xcode-version: 11.x
-
-          - os-version: macos-10.15
+          - os-version: macos-11
             ios-version: 13.x
             xcode-version: 11.x
 
-          - os-version: macos-10.15
+          - os-version: macos-11
             ios-version: 14.x
             xcode-version: 12.x
 
@@ -87,14 +84,8 @@ jobs:
           npm i -g cordova@latest ios-deploy@latest
           npm ci
 
-      - name: Run setup iOS 12.x support
-        if: ${{ matrix.versions.ios-version == '12.x' }}
-        run: |
-          sudo mkdir -p /Library/Developer/CoreSimulator/Profiles/Runtimes
-          sudo ln -s /Applications/Xcode_10.3.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/Library/CoreSimulator/Profiles/Runtimes/iOS.simruntime /Library/Developer/CoreSimulator/Profiles/Runtimes/iOS\ 12.4.simruntime
-
       - name: Run paramedic install
-        if: ${{ endswith(env.repo, '/cordova-paramedic')　!= true }}
+        if: ${{ endswith(env.repo, '/cordova-paramedic') != true }}
         run: npm i -g github:apache/cordova-paramedic
 
       - name: Run paramedic tests