Simplify workflow matrix for MacOS

lballabio · Mar 29, 2024 · 47ba67d · 47ba67d
1 parent 9ff0542
commit 47ba67d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/.github/workflows/macos-nondefault.yml b/.github/workflows/macos-nondefault.yml
@@ -9,17 +9,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        os: [macos-12, macos-13]
+        classes: [boost, std]
         include:
-          - os: [macos-12]
-            shortname: default-12
-          - os: [macos-12]
-            shortname: stdclasses-12
-            cxxflags: "-std=c++17"
-            configureflags: --disable-std-function --disable-std-tuple --enable-std-pointers --enable-std-optional --enable-std-any
-          - os: [macos-13]
-            shortname: default-13
-          - os: [macos-13]
-            shortname: stdclasses-13
+          - classes: std
             cxxflags: "-std=c++17"
             configureflags: --disable-std-function --disable-std-tuple --enable-std-pointers --enable-std-optional --enable-std-any
     steps:

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -6,11 +6,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - os: [macos-12]
-            shortname: default-12
-          - os: [macos-13]
-            shortname: default-13
+        os: [macos-12, macos-13]
     steps:
     - uses: actions/checkout@v4
     - name: Setup
@@ -21,11 +17,11 @@ jobs:
     - name: Cache
       uses: hendrikmuhs/ccache-action@v1.2
       with:
-        key: macos-ci-build-${{ matrix.shortname }}-${{ github.ref }}
+        key: macos-ci-build-${{ matrix.os }}-${{ github.ref }}
         restore-keys: |
-          macos-ci-build-${{ matrix.shortname }}-${{ github.ref }}
-          macos-ci-build-${{ matrix.shortname }}-refs/heads/master
-          macos-ci-build-${{ matrix.shortname }}-
+          macos-ci-build-${{ matrix.os }}-${{ github.ref }}
+          macos-ci-build-${{ matrix.os }}-refs/heads/master
+          macos-ci-build-${{ matrix.os }}-
     - name: Compiler version
       run: |
         clang --version