remove complex object from matrix

phusion · Aug 26, 2024 · ab55d5e · ab55d5e
1 parent c919b98
commit ab55d5e
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,21 +12,22 @@ on:
 
 jobs:
   cxx:
-    name: "C++ unit tests on ${{ matrix.os }}, as ${{ matrix.user.name }}"
+    name: "C++ unit tests on ${{ matrix.os }}, as ${{ matrix.user }}"
     strategy:
       fail-fast: false
       matrix:
         user:
-          - name: 'root'
-            isRoot: '1'
-          - name: 'normal-user'
-            isRoot: '0'
+          - root
+          - 'normal-user'
         os:
           - macos-latest
           - ubuntu-latest
+        exclude:
+          - os: macos-latest
+            user: 'root'
     runs-on: ${{ matrix.os }}
     env:
-      SUDO: ${{ matrix.user.isRoot }}
+      SUDO: ${{ matrix.user == 'root' && 1 || 0 }}
     steps:
     - uses: actions/checkout@v4
       with:
@@ -43,7 +44,7 @@ jobs:
     - run: ls -R buildout
     - uses: actions/upload-artifact@v4
       with:
-        name: cxx-${{ matrix.os }}-${{ matrix.user.name }}
+        name: cxx-${{ matrix.os }}-${{ matrix.user }}
         path: 'buildout/testlogs/*'
 
   integration: