From 4349cc0519f8f4636e618e150cc1ec1404334903 Mon Sep 17 00:00:00 2001
From: trfore <trfore@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:49:37 -0500
Subject: [PATCH 1/2] Revert "ci: refactor to test matrix"

This reverts commit a50c834f1d5f433a2972e0c13a59baca5388449b.
---
 .github/workflows/ci.yml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2d7accb..c9aff86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,30 +16,29 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  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
+  cgroup-v1:
     uses: trfore/docker-image/.github/workflows/test_systemd.yml@main
     with:
-      continue-on-error: ${{ matrix.continue-on-error }}
-      runner: ${{ matrix.runner }}
-      volume-permission: ${{ matrix.volume-permission }}
+      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
 
   check:
     if: always() && failure()
     needs:
-      - test
+      - cgroup-v1
+      - cgroup-v2
     runs-on: ubuntu-latest
     steps:
       - run: >-
           python -c "assert set([
-          '${{ needs.test.result }}',
+          '${{ needs.cgroup-v1.result }}',
+          '${{ needs.cgroup-v2.result }}',
           ]) == {'success'}"

From bf71fad35b9011a07b868f2a970629bab396564d Mon Sep 17 00:00:00 2001
From: trfore <trfore@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:53:31 -0500
Subject: [PATCH 2/2] hotfix: rm cgroup-v1 check

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c9aff86..14ca395 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -39,6 +39,5 @@ jobs:
     steps:
       - run: >-
           python -c "assert set([
-          '${{ needs.cgroup-v1.result }}',
           '${{ needs.cgroup-v2.result }}',
           ]) == {'success'}"