Skip to content

Commit d980fe8

Browse files
lum1n0uslum1n0us
authored
Upgrade macos runner of CIs to 15 (#4770)
* fix: update macOS workflow configurations to use macos-15 and macos-15-intel * fix: remove unsupported build options for macOS workflows
1 parent 32fa697 commit d980fe8

File tree

5 files changed

+47
-41
lines changed

5 files changed

+47
-41
lines changed

‎.github/actions/install-wasi-sdk-wabt/action.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,18 @@ runs:
5050
echo "::notice::wasi-sdk-25 and wabt-1.0.37 installed on ubuntu"
5151
working-directory: /opt
5252

53-
- name: Set up wasi-sdk and wabt on macOS-13 (intel)
54-
if: ${{ inputs.os == 'macos-13' }}
53+
- name: Set up wasi-sdk and wabt on macOS on Intel
54+
if: ${{ inputs.os == 'macos-15-intel' }}
5555
shell: bash
5656
run: |
57-
echo "Downloading wasi-sdk for macOS-13..."
57+
echo "Downloading wasi-sdk for macOS on Intel..."
5858
sudo wget -O wasi-sdk.tar.gz --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-x86_64-macos.tar.gz
5959
6060
echo "Extracting wasi-sdk..."
6161
sudo tar -xf wasi-sdk.tar.gz
6262
sudo ln -sf wasi-sdk-25.0-x86_64-macos wasi-sdk
6363
64-
echo "Downloading wabt for macOS-13..."
64+
echo "Downloading wabt for macOS on Intel..."
6565
sudo wget -O wabt.tar.gz --progress=dot:giga https://github.com/WebAssembly/wabt/releases/download/1.0.36/wabt-1.0.36-macos-12.tar.gz
6666
6767
echo "Extracting wabt..."
@@ -71,21 +71,21 @@ runs:
7171
/opt/wasi-sdk/bin/clang --version
7272
/opt/wabt/bin/wasm-interp --version
7373
74-
echo "::notice::wasi-sdk-25 and wabt-1.0.36 installed on macos-13"
74+
echo "::notice::wasi-sdk-25 and wabt-1.0.36 installed on ${{ inputs.os }}"
7575
working-directory: /opt
7676

77-
- name: Set up wasi-sdk and wabt on macOS-14 (arm64)
78-
if: ${{ inputs.os == 'macos-14' }}
77+
- name: Set up wasi-sdk and wabt on macOS on ARM
78+
if: ${{ inputs.os == 'macos-15' }}
7979
shell: bash
8080
run: |
81-
echo "Downloading wasi-sdk for macOS-14..."
81+
echo "Downloading wasi-sdk for macOS on ARM..."
8282
sudo wget -O wasi-sdk.tar.gz --progress=dot:giga https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-25/wasi-sdk-25.0-arm64-macos.tar.gz
8383
8484
echo "Extracting wasi-sdk..."
8585
sudo tar -xf wasi-sdk.tar.gz
8686
sudo ln -sf wasi-sdk-25.0-arm64-macos wasi-sdk
8787
88-
echo "Downloading wabt for macOS-14..."
88+
echo "Downloading wabt for macOS on ARM..."
8989
sudo wget -O wabt.tar.gz --progress=dot:giga https://github.com/WebAssembly/wabt/releases/download/1.0.37/wabt-1.0.37-macos-14.tar.gz
9090
9191
echo "Extracting wabt..."
@@ -95,7 +95,7 @@ runs:
9595
/opt/wasi-sdk/bin/clang --version
9696
/opt/wabt/bin/wasm-interp --version
9797
98-
echo "::notice::wasi-sdk-25 and wabt-1.0.37 installed on macos-14"
98+
echo "::notice::wasi-sdk-25 and wabt-1.0.37 installed on ${{ inputs.os }}"
9999
working-directory: /opt
100100

101101
- name: Set up wasi-sdk and wabt on Windows

‎.github/workflows/build_llvm_libraries.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ jobs:
4747
- name: checkout
4848
uses: actions/checkout@v6.0.1
4949

50-
- name: install dependencies for non macos-14
51-
if: inputs.os != 'macos-14'
50+
- name: install dependencies for non macos
51+
if: ${{ !startsWith(inputs.os, 'macos') }}
5252
shell: bash
5353
run: /usr/bin/env python3 -m pip install -r requirements.txt
5454
working-directory: build-scripts
5555

56-
- name: install dependencies for macos-14
57-
if: inputs.os == 'macos-14'
56+
- name: install dependencies for macos
57+
if: startsWith(inputs.os, 'macos')
5858
run: /usr/bin/env python3 -m pip install -r requirements.txt --break-system-packages
5959
working-directory: build-scripts
6060

‎.github/workflows/compilation_on_macos.yml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -65,25 +65,28 @@ jobs:
6565
actions: write
6666
uses: ./.github/workflows/build_llvm_libraries.yml
6767
with:
68-
os: "macos-13"
68+
os: "macos-15-intel"
6969
arch: "X86"
7070
build_llvm_libraries_on_arm_macos:
7171
permissions:
7272
contents: read
7373
actions: write
7474
uses: ./.github/workflows/build_llvm_libraries.yml
7575
with:
76-
os: "macos-14"
76+
os: "macos-15"
7777
arch: "AArch64 ARM"
7878

7979
build_wamrc:
80-
needs: [build_llvm_libraries_on_intel_macos]
80+
needs: [build_llvm_libraries_on_intel_macos, build_llvm_libraries_on_arm_macos]
8181
runs-on: ${{ matrix.os }}
8282
strategy:
8383
matrix:
84+
os: [macos-15, macos-15-intel]
8485
include:
85-
- os: macos-13
86+
- os: macos-15-intel
8687
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
88+
- os: macos-15
89+
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
8790
steps:
8891
- name: checkout
8992
uses: actions/checkout@v6.0.1
@@ -112,7 +115,7 @@ jobs:
112115
working-directory: wamr-compiler
113116

114117
build_iwasm:
115-
needs: [build_llvm_libraries_on_intel_macos]
118+
needs: [build_llvm_libraries_on_intel_macos, build_llvm_libraries_on_arm_macos]
116119
runs-on: ${{ matrix.os }}
117120
strategy:
118121
matrix:
@@ -142,7 +145,7 @@ jobs:
142145
"-DWAMR_DISABLE_HW_BOUND_CHECK=1",
143146
"-DWAMR_BUILD_EXTENDED_CONST_EXPR=1",
144147
]
145-
os: [macos-13]
148+
os: [macos-15, macos-15-intel]
146149
platform: [darwin]
147150
exclude:
148151
# incompatible feature and platform
@@ -179,7 +182,9 @@ jobs:
179182
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
180183
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
181184
include:
182-
- os: macos-13
185+
- os: macos-15
186+
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
187+
- os: macos-15-intel
183188
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
184189
# classic interp doesn't support SIMD
185190
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
@@ -218,6 +223,7 @@ jobs:
218223
[
219224
build_iwasm,
220225
build_llvm_libraries_on_intel_macos,
226+
build_llvm_libraries_on_arm_macos,
221227
build_wamrc,
222228
]
223229
runs-on: ${{ matrix.os }}
@@ -227,24 +233,18 @@ jobs:
227233
$AOT_BUILD_OPTIONS,
228234
$CLASSIC_INTERP_BUILD_OPTIONS,
229235
$FAST_INTERP_BUILD_OPTIONS,
230-
$FAST_JIT_BUILD_OPTIONS,
231236
$LLVM_LAZY_JIT_BUILD_OPTIONS,
232237
$LLVM_EAGER_JIT_BUILD_OPTIONS,
233-
$MULTI_TIER_JIT_BUILD_OPTIONS,
234238
]
235-
os: [macos-13]
239+
os: [macos-15, macos-15-intel]
236240
include:
237-
- os: macos-13
241+
- os: macos-15
242+
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
243+
- os: macos-15-intel
238244
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
239245
# classic interp doesn't support SIMD
240246
- make_options: $CLASSIC_INTERP_BUILD_OPTIONS
241247
extra_options: "-DWAMR_BUILD_SIMD=0"
242-
# fast jit doesn't support Multi-module and SIMD
243-
- make_options: $FAST_JIT_BUILD_OPTIONS
244-
extra_options: "-DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
245-
# multi-tier jit doesn't support Multi-module and SIMD
246-
- make_options: $MULTI_TIER_JIT_BUILD_OPTIONS
247-
extra_options: "-DWAMR_BUILD_SIMD=0 -DWAMR_BUILD_MULTI_MODULE=0"
248248
# LLVM JIT doesn't support Multi-module
249249
- make_options: $LLVM_LAZY_JIT_BUILD_OPTIONS
250250
extra_options: "-DWAMR_BUILD_MULTI_MODULE=0"
@@ -303,11 +303,11 @@ jobs:
303303
runs-on: ${{ matrix.os }}
304304
strategy:
305305
matrix:
306-
os: [macos-13, macos-14]
306+
os: [macos-15-intel, macos-15]
307307
include:
308-
- os: macos-13
308+
- os: macos-15-intel
309309
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
310-
- os: macos-14
310+
- os: macos-15
311311
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
312312
steps:
313313
- name: checkout

‎.github/workflows/release_process.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,15 @@ jobs:
8888
os: "ubuntu-22.04"
8989
arch: "AArch64 ARM Mips RISCV X86"
9090

91+
#CLARIFY: Require to build LLVM libraries on ARM macOS?
9192
build_llvm_libraries_on_macos:
9293
permissions:
9394
contents: read
9495
actions: write
9596
needs: [create_tag, create_release]
9697
uses: ./.github/workflows/build_llvm_libraries.yml
9798
with:
98-
os: "macos-13"
99+
os: "macos-15-intel"
99100
arch: "AArch64 ARM Mips RISCV X86"
100101

101102
build_llvm_libraries_on_windows:
@@ -122,6 +123,7 @@ jobs:
122123
upload_url: ${{ needs.create_release.outputs.upload_url }}
123124
ver_num: ${{ needs.create_tag.outputs.new_ver }}
124125

126+
#CLARIFY: Require to release wamrc on ARM macOS?
125127
release_wamrc_on_ubuntu_macos:
126128
permissions:
127129
contents: write # upload release artifact
@@ -130,7 +132,7 @@ jobs:
130132
with:
131133
llvm_cache_key: ${{ needs.build_llvm_libraries_on_macos.outputs.cache_key }}
132134
release: true
133-
runner: macos-13
135+
runner: macos-15-intel
134136
upload_url: ${{ needs.create_release.outputs.upload_url }}
135137
ver_num: ${{ needs.create_tag.outputs.new_ver }}
136138

@@ -160,6 +162,7 @@ jobs:
160162
upload_url: ${{ needs.create_release.outputs.upload_url }}
161163
ver_num: ${{ needs.create_tag.outputs.new_ver}}
162164

165+
#CLARIFY: Require to release iwasm on ARM macOS?
163166
release_iwasm_on_macos:
164167
permissions:
165168
contents: write # upload release artifact
@@ -168,7 +171,7 @@ jobs:
168171
with:
169172
cwd: product-mini/platforms/darwin
170173
llvm_cache_key: ${{ needs.build_llvm_libraries_on_macos.outputs.cache_key }}
171-
runner: macos-13
174+
runner: macos-15-intel
172175
upload_url: ${{ needs.create_release.outputs.upload_url }}
173176
ver_num: ${{ needs.create_tag.outputs.new_ver}}
174177

@@ -200,6 +203,7 @@ jobs:
200203
wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
201204
wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
202205

206+
#CLARIFY: Require to release WAMR SDK on ARM macOS?
203207
release_wamr_sdk_on_macos:
204208
permissions:
205209
contents: write # upload release artifact
@@ -208,7 +212,7 @@ jobs:
208212
uses: ./.github/workflows/build_wamr_sdk.yml
209213
with:
210214
config_file: wamr_config_macos_release.cmake
211-
runner: macos-13
215+
runner: macos-15-intel
212216
upload_url: ${{ needs.create_release.outputs.upload_url }}
213217
ver_num: ${{ needs.create_tag.outputs.new_ver}}
214218
wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-macos.tar.gz
@@ -251,14 +255,15 @@ jobs:
251255
upload_url: ${{ needs.create_release.outputs.upload_url }}
252256
ver_num: ${{ needs.create_tag.outputs.new_ver}}
253257

258+
#CLARIFY: Require to release WAMR LLDB on ARM macOS?
254259
release_wamr_lldb_on_macos_universal:
255260
permissions:
256261
contents: write # upload release artifact
257262
needs: [create_tag, create_release]
258263
if: ${{ inputs.release_wamr_lldb }}
259264
uses: ./.github/workflows/build_wamr_lldb.yml
260265
with:
261-
runner: macos-13
266+
runner: macos-15-intel
262267
arch: universal
263268
upload_url: ${{ needs.create_release.outputs.upload_url }}
264269
ver_num: ${{ needs.create_tag.outputs.new_ver}}

‎.github/workflows/wamr_wasi_extensions.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
runs-on: ${{ matrix.os }}
2828
strategy:
2929
matrix:
30-
os: [ubuntu-22.04, macos-13, macos-14]
30+
os: [ubuntu-22.04, macos-15-intel, macos-15]
3131
steps:
3232
- name: checkout
3333
uses: actions/checkout@v6.0.1
@@ -48,8 +48,9 @@ jobs:
4848
./build_samples.sh $(pwd)/dist/wamr-wasi-extensions
4949
working-directory: wamr-wasi-extensions
5050

51+
#CLARIFY: Require to upload artifact on ARM macOS?
5152
- name: Upload artifacts
52-
if: matrix.os == 'macos-14'
53+
if: matrix.os == 'macos-15'
5354
uses: actions/upload-artifact@v6.0.0
5455
with:
5556
name: wamr-wasi-extensions

0 commit comments

Comments
 (0)