macos tests

danielaparker · May 23, 2024 · fe824ca · fe824ca
1 parent e2b7ff9
commit fe824ca
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 54 deletions.
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -6,59 +6,43 @@ permissions:
   contents: read
 
 jobs:
-  build1:
-
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: cmake
-      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
-
-  build1_11:
-
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: cmake
-      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On -DCMAKE_CXX_STANDARD=11 -DCMAKE_CXX_STANDARD_REQUIRED=ON
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
-
-  build1_14:
-
-    runs-on: macos-latest
 
+  xcode_1:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        xcode: ['11','12','13','14']
     steps:
-    - uses: actions/checkout@v4
-    - name: cmake
-      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On -DCMAKE_CXX_STANDARD=14 -DCMAKE_CXX_STANDARD_REQUIRED=ON
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
-
-  build1_20:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+      - uses: maxim-lobanov/setup-xcode@v1
+        with:
+          xcode-version: ${{ matrix.xcode }}
+      - name: cmake
+        run: cmake -S . -B build -DJSONCONS_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On 
+      - name: build
+        working-directory: build/
+        run: cmake --build . 
+      - name: test
+        working-directory: build/
+        run: ctest --output-on-failure
+
+  xcode_2:
 
     runs-on: macos-latest
 
     steps:
     - uses: actions/checkout@v4
     - name: cmake
-      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD_REQUIRED=ON
+      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On -DCMAKE_CXX_STANDARD=17 -DCMAKE_CXX_STANDARD_REQUIRED=ON
     - name: build
       run: cmake --build build --parallel 10
     - name: test
       run: cd build ; ctest -j 10 --output-on-failure
 
-  build2:
+  xcode_3:
 
     runs-on: macos-latest
 
@@ -70,16 +54,3 @@ jobs:
       run: cmake --build build --parallel 10
     - name: test
       run: cd build ; ctest -j 10 --output-on-failure
-
-  build2_20:
-
-    runs-on: macos-latest
-
-    steps:
-    - uses: actions/checkout@v4
-    - name: cmake
-      run: cmake -S . -B build -DJSONCONS_SANITIZE=ON -DCMAKE_BUILD_TYPE=Debug -DJSONCONS_BUILD_TESTS=On -DCMAKE_CXX_STANDARD=20 -DCMAKE_CXX_STANDARD_REQUIRED=ON
-    - name: build
-      run: cmake --build build --parallel 10
-    - name: test
-      run: cd build ; ctest -j 10 --output-on-failure
diff --git a/.github/workflows/macos.yml.bak b/.github/workflows/macos.yml.bak
@@ -9,7 +9,6 @@ jobs:
 
   xcode_1:
     runs-on: ${{ matrix.os }}
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix: