Merge pull request #1 from sjrdc/sjrdc/fix_ci

Sjrdc/fix ci
USCiLab · Dec 9, 2024 · 31efcaf · 31efcaf
2 parents 584b496 + f4a6dbd
commit 31efcaf
Show file tree

Hide file tree

Showing 2 changed files with 249 additions and 250 deletions.
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -1,45 +1,45 @@
-# name: cereal mac ci
-# on: [push, pull_request]
+name: cereal mac ci
+on: [push, pull_request]
 
-# jobs:
-#   test_cereal_macos:
-#     runs-on: macos-latest
-#     strategy:
-#       fail-fast: false
-#       matrix:
-#         include:
-#           - CMAKE_OPTIONS: '-DWITH_WERROR=OFF -DSKIP_PORTABILITY_TEST=ON -DSKIP_PERFORMANCE_COMPARISON=ON'
-#             COMPILER: 'clang++'
-#             XCODE_VERSION: 11
-#             NAME: macos-latest-clang-xcode11
+jobs:
+  test_cereal_macos:
+    runs-on: macos-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - CMAKE_OPTIONS: '-DWITH_WERROR=OFF -DSKIP_PORTABILITY_TEST=ON -DSKIP_PERFORMANCE_COMPARISON=ON'
+            COMPILER: 'clang++'
+            XCODE_VERSION: 11
+            NAME: macos-latest-clang-xcode11
 
-#           - CMAKE_OPTIONS: '-DWITH_WERROR=OFF -DSKIP_PORTABILITY_TEST=ON -DSKIP_PERFORMANCE_COMPARISON=ON'
-#             COMPILER: 'clang++'
-#             XCODE_VERSION: 12
-#             NAME: macos-latest-clang-xcode12
-#     name: ${{ matrix.name }}
+          - CMAKE_OPTIONS: '-DWITH_WERROR=OFF -DSKIP_PORTABILITY_TEST=ON -DSKIP_PERFORMANCE_COMPARISON=ON'
+            COMPILER: 'clang++'
+            XCODE_VERSION: 12
+            NAME: macos-latest-clang-xcode12
+    name: ${{ matrix.name }}
 
-#     steps:
-#     - name: Checkout code
-#       uses: actions/checkout@v4
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
 
-#     - uses: maxim-lobanov/setup-xcode@v1
-#       with:
-#         xcode-version: ${{ matrix.XCODE_VERSION }}
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: ${{ matrix.XCODE_VERSION }}
 
-#     - name: build and test
-#       shell: bash
-#       env:
-#         CMAKE_OPTIONS: ${{ matrix.CMAKE_OPTIONS }}
-#         COMPILER: ${{ matrix.COMPILER }}
-#       run: |
-#         set -ex
-#         # Set compiler and env variables
-#         export CXX=${COMPILER}
-#         ${CXX} --version
+    - name: build and test
+      shell: bash
+      env:
+        CMAKE_OPTIONS: ${{ matrix.CMAKE_OPTIONS }}
+        COMPILER: ${{ matrix.COMPILER }}
+      run: |
+        set -ex
+        # Set compiler and env variables
+        export CXX=${COMPILER}
+        ${CXX} --version
 
-#         # Build cereal and test
-#         cmake --version
-#         mkdir build && cd build
-#         cmake ${CMAKE_OPTIONS} .. && make -j4 VERBOSE=1
-#         ctest . --output-on-failure
+        # Build cereal and test
+        cmake --version
+        mkdir build && cd build
+        cmake ${CMAKE_OPTIONS} .. && make -j4 VERBOSE=1
+        ctest . --output-on-failure