Macos matrix build

badaix · Jun 30, 2022 · 90a7206 · 90a7206
1 parent fe1cbd9
commit 90a7206
Showing 1 changed file with 19 additions and 48 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -80,59 +80,30 @@ jobs:
       run: cmake --build build --parallel 3
 
 
-  macos-11:
+  macos:
 
     strategy:
       fail-fast: false
       matrix:
-        xcode: ['11.7', '12.5.1', '13.2.1']
-
-    runs-on: macos-11
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: dependencies
-      run: brew install pkgconfig libsoxr ccache expat
-    - name: cache boost
-      id: cache-boost
-      uses: actions/cache@v2
-      with:
-        path: boost_${{ env.BOOST_VERSION }}
-        key: ${{ runner.os }}-boost
-    - name: get boost
-      if: steps.cache-boost.outputs.cache-hit != 'true'
-      run: |
-        wget https://boostorg.jfrog.io/artifactory/main/release/${BOOST_VERSION//_/.}/source/boost_${BOOST_VERSION}.tar.bz2
-        tar xjf boost_${BOOST_VERSION}.tar.bz2
-    - name: cache ccache
-      id: cache-ccache
-      uses: actions/cache@v2
-      with:
-        path: /Users/runner/Library/Caches/ccache
-        key: ${{ runner.os }}-${{ matrix.xcode }}-ccache-${{ github.sha }}
-        restore-keys: ${{ runner.os }}-${{ matrix.xcode }}-ccache-
-    - name: cmake
-      run: |
-        cmake -S . -B build \
-          -DWERROR=ON -DBUILD_TESTS=ON \
-          -DBOOST_ROOT=boost_${BOOST_VERSION} \
-          -DCMAKE_BUILD_TYPE=Release \
-          -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-          -DCMAKE_CXX_FLAGS="-I/usr/local/include -DCMAKE_CXX_FLAGS=-DJSON_HAS_CPP_14 -Wno-deprecated-declarations"
-      env:
-        DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
-    - name: build
-      run: cmake --build build --parallel 3 --verbose
-
-
-  macos-12:
-
-    strategy:
-      fail-fast: false
-      matrix:
-        xcode: ['13.3.1', '13.4.1']
+        xcode: 
+          - 11.7
+          - 12.5.1
+          - 13.2.1
+          - 13.3.1
+          - 13.4.1
+        include:
+          - xcode: 11.7
+            os: macos-11
+          - xcode: 12.5.1
+            os: macos-11
+          - xcode: 13.2.1
+            os: macos-11
+          - xcode: 13.3.1
+            os: macos-12
+          - xcode: 13.4.1
+            os: macos-12
 
-    runs-on: macos-12
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2