Merge branch 'main' into update-baseos

trfore · Jul 3, 2024 · 0ee73d7 · 0ee73d7
2 parents eafd0c1 + a0ec7b1
commit 0ee73d7
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,29 +16,30 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  cgroup-v1:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - continue-on-error: true
+            runner: ubuntu-20.04
+            volume-permission: ro
+          - continue-on-error: false
+            runner: ubuntu-22.04
+            volume-permission: rw
     uses: trfore/docker-image/.github/workflows/test_systemd.yml@main
     with:
-      continue-on-error: true
-      runner: ubuntu-20.04
-      volume-permission: ro
-
-  cgroup-v2:
-    uses: trfore/docker-image/.github/workflows/test_systemd.yml@main
-    with:
-      continue-on-error: false
-      runner: ubuntu-22.04
-      volume-permission: rw
+      continue-on-error: ${{ matrix.continue-on-error }}
+      runner: ${{ matrix.runner }}
+      volume-permission: ${{ matrix.volume-permission }}
 
   check:
     if: always() && failure()
     needs:
-      - cgroup-v1
-      - cgroup-v2
+      - test
     runs-on: ubuntu-latest
     steps:
       - run: >-
           python -c "assert set([
-          '${{ needs.cgroup-v1.result }}',
-          '${{ needs.cgroup-v2.result }}',
+          '${{ needs.test.result }}',
           ]) == {'success'}"