Skip to content

Update MacOS arm jobs in ci to MacOS 26 #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update MacOS arm jobs in ci to MacOS 26 #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08f3326
Update MacOS arm jobs in ci to MacOS 26
mcbarton Oct 9, 2025
ca64c89
Try using Homebrews llvm 20 for MacOS 26 jobs
mcbarton Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/actions/Miscellaneous/Setup_Compiler/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ runs:
echo "CC=gcc-${vers}" >> $GITHUB_ENV
echo "CXX=g++-${vers}" >> $GITHUB_ENV
else
brew install llvm@15
if [[ "$(uname -m)" == "x86_64" ]]; then
brew install llvm@15
echo "CC=/usr/local/opt/llvm@15/bin/clang" >> $GITHUB_ENV
echo "CXX=/usr/local/opt/llvm@15/bin/clang++" >> $GITHUB_ENV
else
echo "CC=/opt/homebrew/opt/llvm@15/bin/clang" >> $GITHUB_ENV
echo "CXX=/opt/homebrew/opt/llvm@15/bin/clang++" >> $GITHUB_ENV
echo "CC=/opt/homebrew/opt/llvm@20/bin/clang" >> $GITHUB_ENV
echo "CXX=/opt/homebrew/opt/llvm@20/bin/clang++" >> $GITHUB_ENV
fi
fi
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
Expand Down Expand Up @@ -75,3 +75,4 @@ runs:
{
echo "Unsupported compiler - fix YAML file"
}

4 changes: 2 additions & 2 deletions .github/workflows/deploy-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
fail-fast: false
matrix:
include:
- name: osx15-arm-clang-repl-20-emscripten_wasm
os: macos-15
- name: osx26-arm-clang-repl-20-emscripten_wasm
os: macos-26
clang-runtime: '20'
cling: Off
micromamba_shell_init: bash
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/emscripten.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
llvm_enable_projects: "clang;lld"
llvm_targets_to_build: "WebAssembly"
emsdk_ver: "3.1.73"
- name: osx15-arm-clang-repl-19-emscripten
os: macos-15
- name: osx26-arm-clang-repl-19-emscripten
os: macos-26
clang-runtime: '19'
cling: Off
llvm_enable_projects: "clang;lld"
Expand All @@ -56,8 +56,8 @@ jobs:
llvm_enable_projects: "clang;lld"
llvm_targets_to_build: "WebAssembly"
emsdk_ver: "3.1.73"
- name: osx15-arm-clang-repl-20-emscripten
os: macos-15
- name: osx26-arm-clang-repl-20-emscripten
os: macos-26
clang-runtime: '20'
cling: Off
llvm_enable_projects: "clang;lld"
Expand Down Expand Up @@ -395,8 +395,8 @@ jobs:
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.73"
- name: osx15-arm-clang-repl-19-emscripten_wasm
os: macos-15
- name: osx26-arm-clang-repl-19-emscripten_wasm
os: macos-26
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
Expand All @@ -419,8 +419,8 @@ jobs:
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.73"
- name: osx15-arm-clang-repl-20-emscripten_wasm
os: macos-15
- name: osx26-arm-clang-repl-20-emscripten_wasm
os: macos-26
clang-runtime: '20'
cling: Off
micromamba_shell_init: bash
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,32 +100,32 @@ jobs:
llvm_enable_projects: "clang"
llvm_targets_to_build: "host;NVPTX"
# MacOS Arm Jobs
- name: osx15-arm-clang-clang-repl-20
os: macos-15
- name: osx26-arm-clang-clang-repl-20
os: macos-26
compiler: clang
clang-runtime: '20'
cling: Off
cppyy: Off
llvm_enable_projects: "clang"
llvm_targets_to_build: "host"
- name: osx15-arm-clang-clang-repl-19-cppyy
os: macos-15
- name: osx26-arm-clang-clang-repl-19-cppyy
os: macos-26
compiler: clang
clang-runtime: '19'
cling: Off
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host"
- name: osx15-arm-clang-clang-repl-18-cppyy
os: macos-15
- name: osx26-arm-clang-clang-repl-18-cppyy
os: macos-26
compiler: clang
clang-runtime: '18'
cling: Off
cppyy: On
llvm_enable_projects: "clang"
llvm_targets_to_build: "host"
- name: osx15-arm-clang-clang18-cling-cppyy
os: macos-15
- name: osx26-arm-clang-clang18-cling-cppyy
os: macos-26
compiler: clang
clang-runtime: '18'
cling: On
Expand Down Expand Up @@ -290,3 +290,4 @@ jobs:
# When debugging increase to a suitable value!
timeout-minutes: 30


Loading