Skip to content

Commit 0c48801

Browse files
committed
Update MacOS arm jobs in ci to MacOS 26
1 parent e1e07e0 commit 0c48801

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

.github/actions/Miscellaneous/Setup_Compiler/action.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ runs:
1515
echo "CC=gcc-${vers}" >> $GITHUB_ENV
1616
echo "CXX=g++-${vers}" >> $GITHUB_ENV
1717
else
18-
brew install llvm@15
1918
if [[ "$(uname -m)" == "x86_64" ]]; then
19+
brew install llvm@15
2020
echo "CC=/usr/local/opt/llvm@15/bin/clang" >> $GITHUB_ENV
2121
echo "CXX=/usr/local/opt/llvm@15/bin/clang++" >> $GITHUB_ENV
2222
else
23-
echo "CC=/opt/homebrew/opt/llvm@15/bin/clang" >> $GITHUB_ENV
24-
echo "CXX=/opt/homebrew/opt/llvm@15/bin/clang++" >> $GITHUB_ENV
23+
echo "CC=/opt/homebrew/opt/llvm@20/bin/clang" >> $GITHUB_ENV
24+
echo "CXX=/opt/homebrew/opt/llvm@20/bin/clang++" >> $GITHUB_ENV
2525
fi
2626
fi
2727
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
@@ -75,3 +75,4 @@ runs:
7575
{
7676
echo "Unsupported compiler - fix YAML file"
7777
}
78+

.github/workflows/deploy-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ jobs:
2121
fail-fast: false
2222
matrix:
2323
include:
24-
- name: osx15-arm-clang-repl-20-emscripten_wasm
25-
os: macos-15
24+
- name: osx26-arm-clang-repl-20-emscripten_wasm
25+
os: macos-26
2626
clang-runtime: '20'
2727
cling: Off
2828
micromamba_shell_init: bash

.github/workflows/emscripten.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
llvm_enable_projects: "clang;lld"
2929
llvm_targets_to_build: "WebAssembly"
3030
emsdk_ver: "3.1.73"
31-
- name: osx15-arm-clang-repl-19-emscripten
32-
os: macos-15
31+
- name: osx26-arm-clang-repl-19-emscripten
32+
os: macos-26
3333
clang-runtime: '19'
3434
cling: Off
3535
llvm_enable_projects: "clang;lld"
@@ -56,8 +56,8 @@ jobs:
5656
llvm_enable_projects: "clang;lld"
5757
llvm_targets_to_build: "WebAssembly"
5858
emsdk_ver: "3.1.73"
59-
- name: osx15-arm-clang-repl-20-emscripten
60-
os: macos-15
59+
- name: osx26-arm-clang-repl-20-emscripten
60+
os: macos-26
6161
clang-runtime: '20'
6262
cling: Off
6363
llvm_enable_projects: "clang;lld"
@@ -395,8 +395,8 @@ jobs:
395395
cling: Off
396396
micromamba_shell_init: bash
397397
emsdk_ver: "3.1.73"
398-
- name: osx15-arm-clang-repl-19-emscripten_wasm
399-
os: macos-15
398+
- name: osx26-arm-clang-repl-19-emscripten_wasm
399+
os: macos-26
400400
clang-runtime: '19'
401401
cling: Off
402402
micromamba_shell_init: bash
@@ -419,8 +419,8 @@ jobs:
419419
cling: Off
420420
micromamba_shell_init: bash
421421
emsdk_ver: "3.1.73"
422-
- name: osx15-arm-clang-repl-20-emscripten_wasm
423-
os: macos-15
422+
- name: osx26-arm-clang-repl-20-emscripten_wasm
423+
os: macos-26
424424
clang-runtime: '20'
425425
cling: Off
426426
micromamba_shell_init: bash

.github/workflows/main.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -100,32 +100,32 @@ jobs:
100100
llvm_enable_projects: "clang"
101101
llvm_targets_to_build: "host;NVPTX"
102102
# MacOS Arm Jobs
103-
- name: osx15-arm-clang-clang-repl-20
104-
os: macos-15
103+
- name: osx26-arm-clang-clang-repl-20
104+
os: macos-26
105105
compiler: clang
106106
clang-runtime: '20'
107107
cling: Off
108108
cppyy: Off
109109
llvm_enable_projects: "clang"
110110
llvm_targets_to_build: "host"
111-
- name: osx15-arm-clang-clang-repl-19-cppyy
112-
os: macos-15
111+
- name: osx26-arm-clang-clang-repl-19-cppyy
112+
os: macos-26
113113
compiler: clang
114114
clang-runtime: '19'
115115
cling: Off
116116
cppyy: On
117117
llvm_enable_projects: "clang"
118118
llvm_targets_to_build: "host"
119-
- name: osx15-arm-clang-clang-repl-18-cppyy
120-
os: macos-15
119+
- name: osx26-arm-clang-clang-repl-18-cppyy
120+
os: macos-26
121121
compiler: clang
122122
clang-runtime: '18'
123123
cling: Off
124124
cppyy: On
125125
llvm_enable_projects: "clang"
126126
llvm_targets_to_build: "host"
127-
- name: osx15-arm-clang-clang18-cling-cppyy
128-
os: macos-15
127+
- name: osx26-arm-clang-clang18-cling-cppyy
128+
os: macos-26
129129
compiler: clang
130130
clang-runtime: '18'
131131
cling: On

0 commit comments

Comments
 (0)