Use strategies

SRGSSR · Nov 10, 2024 · 1fda925 · 1fda925
1 parent 8c6b433
commit 1fda925
Showing 1 changed file with 12 additions and 30 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -89,53 +89,35 @@ jobs:
           ${{ env.ci_scripts_path }}/vm-resolve-spm-dependencies.sh \
           ${{ env.scripts_path }} ${{ env.vm_name }}
 
-  test-ios:
+  test:
     needs: [install-tools, resolve-spm-dependencies]
     runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
+    strategy:
+      matrix:
+        platform: [ios, tvos]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Run the iOS tests
+      - name: Run tests
         run: |
           ${{ env.ci_scripts_path }}/vm-test.sh \
-          ${{ env.scripts_path }} ${{ env.vm_name }} "ios"
+          ${{ env.scripts_path }} ${{ env.vm_name }} ${{ matrix.platform }}
 
-  test-tvos:
-    needs: [install-tools, resolve-spm-dependencies]
-    runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Run the tvOS tests
-        run: |
-          ${{ env.ci_scripts_path }}/vm-test.sh \
-          ${{ env.scripts_path }} ${{ env.vm_name }} "tvos"
-
-  archive-demo-ios:
-    needs: [install-tools, test-ios, test-tvos]
-    runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Archive the iOS demo
-        run: |
-          ${{ env.ci_scripts_path }}/vm-test.sh \
-          ${{ env.scripts_path }} ${{ env.vm_name }} "ios"
-
-  archive-demo-tvos:
+  archive-demo:
     needs: [install-tools, test-ios, test-tvos]
     runs-on: ${{ needs.install-tools.outputs.runner_group_label }}
+    strategy:
+      matrix:
+        platform: [ios, tvos]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Archive the tvOS demo
+      - name: Archive the demo
         run: |
           ${{ env.ci_scripts_path }}/vm-test.sh \
-          ${{ env.scripts_path }} ${{ env.vm_name }} "tvos"
+          ${{ env.scripts_path }} ${{ env.vm_name }} ${{ matrix.platform }}
 
   clean:
     needs: [install-tools, archive-demo-ios, archive-demo-tvos]