From cd237e57d4987a5ca24c0e24f04c15cc35247682 Mon Sep 17 00:00:00 2001 From: Tyler Veness Date: Sat, 1 Nov 2025 09:17:09 -0700 Subject: [PATCH] [ci] Upgrade to macOS 15 runner image (#8321) This fixes a compiler bug (rejecting out-of-line definitions of constrained members) newer versions of Sleipnir were encountering. --- .github/workflows/bazel.yml | 2 +- .github/workflows/cmake.yml | 2 +- .github/workflows/gradle.yml | 10 +++++----- .github/workflows/sentinel-build.yml | 10 +++++----- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/bazel.yml b/.github/workflows/bazel.yml index 3b93739f3a..bd5aedb6d2 100644 --- a/.github/workflows/bazel.yml +++ b/.github/workflows/bazel.yml @@ -37,7 +37,7 @@ jobs: build-mac: name: "Mac" - runs-on: macos-14 + runs-on: macOS-15 steps: - uses: actions/checkout@v4 with: { fetch-depth: 0 } diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 82fdb8bc23..c7083911f4 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -20,7 +20,7 @@ jobs: name: Linux container: wpilib/roborio-cross-ubuntu:2025-22.04 flags: "--preset with-java-and-sccache -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON" - - os: macOS-14 + - os: macOS-15 name: macOS container: "" env: "" diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 145949908a..216873e2ca 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -98,7 +98,7 @@ jobs: build-options: "-PciReleaseOnly -Pbuildwinarm64 -Ponlywindowsarm64" task: "copyAllOutputs" outputs: "build/allOutputs" - - os: macOS-14 + - os: macOS-15 artifact-name: macOS architecture: aarch64 task: "build" @@ -153,7 +153,7 @@ jobs: if: matrix.os == 'windows-2022' - name: Check disk free space pre-cleanup (macOS) run: df -h . - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - name: Cleanup disk space # CodeQL: 5G # go: 748M @@ -162,10 +162,10 @@ jobs: rm -rf /Users/runner/hostedtoolcache/CodeQL rm -rf /Users/runner/hostedtoolcache/go rm -rf /Users/runner/Library/Android - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - name: Check disk free space post-cleanup (macOS) run: df -h . - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - name: Build with Gradle run: ./gradlew ${{ matrix.task }} --build-cache -PbuildServer -PskipJavaFormat ${{ matrix.build-options }} ${{ env.EXTRA_GRADLE_ARGS }} env: @@ -181,7 +181,7 @@ jobs: if: matrix.os == 'windows-2022' - name: Check disk free space (macOS) run: df -h . - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact-name }} diff --git a/.github/workflows/sentinel-build.yml b/.github/workflows/sentinel-build.yml index c059efda2c..fc169f0c25 100644 --- a/.github/workflows/sentinel-build.yml +++ b/.github/workflows/sentinel-build.yml @@ -97,7 +97,7 @@ jobs: build-options: "-PciReleaseOnly -Pbuildwinarm64 -Ponlywindowsarm64" task: "copyAllOutputs" outputs: "build/allOutputs" - - os: macOS-14 + - os: macOS-15 artifact-name: macOS architecture: aarch64 task: "build" @@ -146,7 +146,7 @@ jobs: if: matrix.os == 'windows-2022' - name: Check disk free space pre-cleanup (macOS) run: df -h . - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - name: Cleanup disk space # CodeQL: 5G # go: 748M @@ -155,10 +155,10 @@ jobs: rm -rf /Users/runner/hostedtoolcache/CodeQL rm -rf /Users/runner/hostedtoolcache/go rm -rf /Users/runner/Library/Android - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - name: Check disk free space post-cleanup (macOS) run: df -h . - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - name: Build with Gradle run: ./gradlew ${{ matrix.task }} -PbuildServer -PskipJavaFormat ${{ matrix.build-options }} - name: Sign Libraries with Developer ID @@ -170,7 +170,7 @@ jobs: if: matrix.os == 'windows-2022' - name: Check disk free space (macOS) run: df -h . - if: matrix.os == 'macOS-14' + if: matrix.os == 'macOS-15' - uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact-name }}