diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fe015067..edea2f36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -156,7 +156,7 @@ jobs: matrix: os: - ubuntu-24.04 - - macos-14 + - macos-15 static: - On - Off @@ -201,7 +201,7 @@ jobs: matrix: os: - ubuntu-24.04 - - macos-14 + - macos-15 steps: - uses: actions/checkout@v5 @@ -378,7 +378,7 @@ jobs: artifact: "windows-msvc-25" } - { - os: macos-14, name: "MacOS Clang 16", + os: macos-15, name: "MacOS Clang 16", artifact: "macos-clang-16", compiler: clang, compiler_version: 16, sanitizers: "On" } @@ -494,7 +494,7 @@ jobs: - { os: ubuntu-24.04, name: "Ubuntu GCC 14", artifact: "ubuntu-gcc-14", compiler_version: 14, } - { os: windows-2022, name: "Windows VS 2022", artifact: "windows-msvc-22", compiler_version: 22, } - { os: windows-2025, name: "Windows VS 2025", artifact: "windows-msvc-25", compiler_version: 26, } - - { os: macos-14, name: "MacOS Clang 16", artifact: "macos-clang-16", compiler_version: 16, } + - { os: macos-15, name: "MacOS Clang 16", artifact: "macos-clang-16", compiler_version: 16, } steps: - uses: actions/checkout@v5 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 972b9ceb..d024e46c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -34,7 +34,7 @@ jobs: artifact: "windows-msvc-22" } - { - os: macos-14, name: "MacOS Clang 16", + os: macos-15, name: "MacOS Clang 16", artifact: "macos-clang-16", compiler: clang, compiler_version: 16, } diff --git a/.github/workflows/setup-compilers/action.yaml b/.github/workflows/setup-compilers/action.yaml index 398653cf..1d7943b2 100644 --- a/.github/workflows/setup-compilers/action.yaml +++ b/.github/workflows/setup-compilers/action.yaml @@ -36,8 +36,8 @@ runs: shell: bash run: | if [[ '${{ startsWith(inputs.os_name, 'macos') }}' == 'true' ]]; then - echo "cc=/opt/homebrew/opt/llvm@${{ inputs.compiler_version }}/bin/${{ inputs.compiler }}" >> $GITHUB_OUTPUT - echo "cxx=/opt/homebrew/opt/llvm@${{ inputs.compiler_version }}/bin/${{ inputs.compiler }}++" >> $GITHUB_OUTPUT + echo "cc=$(xcrun --find clang)" >> $GITHUB_OUTPUT + echo "cxx=$(xcrun --find clang++)" >> $GITHUB_OUTPUT elif [[ '${{ inputs.compiler }}' == 'clang' ]]; then echo "cc=clang-${{ inputs.compiler_version }}" >> $GITHUB_OUTPUT echo "cxx=clang++-${{ inputs.compiler_version }}" >> $GITHUB_OUTPUT @@ -61,12 +61,6 @@ runs: libc++-${{ inputs.compiler_version }}-dev libc++abi-${{ inputs.compiler_version }}-dev \ clang-tools-${{ inputs.compiler_version }} llvm-${{ inputs.compiler_version }} - - name: Update LLVM compilers - if: startsWith(inputs.os_name, 'macos') - shell: bash - run: | - brew install llvm@${{ inputs.compiler_version }} - - name: Setup Windows environment uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0 if: startsWith(inputs.os_name, 'windows')