Add linux arm build and macos-15

tashcan · Jan 16, 2025 · d6790db · d6790db
1 parent 9a88236
commit d6790db
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 16 deletions.
diff --git a/.github/workflows/benchmark.yaml b/.github/workflows/benchmark.yaml
@@ -11,7 +11,7 @@ permissions:
 jobs:
   benchmark:
     name: Detour check
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v4
         with:
@@ -23,10 +23,6 @@ jobs:
         run: |
           echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
-      - uses: mjp41/workaround8649@c8550b715ccdc17f89c8d5c28d7a48eeff9c94a8
-        with:
-          os: ubuntu-latest
-
       - name: Configure CMake
         run: >
           cmake -B ${{ steps.strings.outputs.build-output-dir }}

diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml
@@ -13,7 +13,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-13, macos-14]
+        os:
+          [
+            ubuntu-24.04,
+            ubuntu-24.04-arm,
+            windows-latest,
+            macos-13,
+            macos-14,
+            macos-15,
+          ]
         build_type: [Release, Debug]
         c_compiler: [gcc, clang, cl, clang-cl]
         include:
@@ -24,10 +32,16 @@ jobs:
             c_compiler: clang-cl
             cpp_compiler: clang-cl
             toolset: ClangCL
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             c_compiler: gcc
             cpp_compiler: g++
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
+            c_compiler: clang
+            cpp_compiler: clang++
+          - os: ubuntu-24.04-arm
+            c_compiler: gcc
+            cpp_compiler: g++
+          - os: ubuntu-24.04-arm
             c_compiler: clang
             cpp_compiler: clang++
           - os: macos-13
@@ -36,14 +50,21 @@ jobs:
           - os: macos-14
             c_compiler: clang
             cpp_compiler: clang++
+          - os: macos-15
+            c_compiler: clang
+            cpp_compiler: clang++
         exclude:
           - os: windows-latest
             c_compiler: gcc
           - os: windows-latest
             c_compiler: clang
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
             c_compiler: cl
-          - os: ubuntu-latest
+          - os: ubuntu-24.04
+            c_compiler: clang-cl
+          - os: ubuntu-24.04-arm
+            c_compiler: cl
+          - os: ubuntu-24.04-arm
             c_compiler: clang-cl
           - os: macos-13
             c_compiler: cl
@@ -57,6 +78,12 @@ jobs:
             c_compiler: clang-cl
           - os: macos-14
             c_compiler: gcc
+          - os: macos-15
+            c_compiler: cl
+          - os: macos-15
+            c_compiler: clang-cl
+          - os: macos-15
+            c_compiler: gcc
     steps:
       - uses: actions/checkout@v4
         with:
@@ -68,10 +95,6 @@ jobs:
         run: |
           echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
 
-      - uses: mjp41/workaround8649@c8550b715ccdc17f89c8d5c28d7a48eeff9c94a8
-        with:
-          os: ${{ matrix.os }}
-
       - name: Configure CMake
         if: ${{ startsWith(matrix.toolset, 'ClangCL') }}
         run: >

diff --git a/.github/workflows/publish-docs.yaml b/.github/workflows/publish-docs.yaml
@@ -6,7 +6,7 @@ on:
 jobs:
   publish:
     environment: docs
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     permissions:
       contents: read
       deployments: write

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -314,7 +314,7 @@ if(SPUD_BUILD_TESTS)
         FetchContent_Declare(
             Catch2
             GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-            GIT_TAG v3.0.1
+            GIT_TAG v3.8.0
         )
 
         FetchContent_MakeAvailable(Catch2)