gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2026-01-16 22:36:40 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix: update macOS workflow configurations to use macos-15 and macos-15-intel

Browse Source
This commit is contained in:
liang.he@intel.com 2025-12-18 06:23:40 +00:00
parent 45e3e1ea98
commit a18aef6262
4 changed files with 37 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.github/workflows/build_llvm_libraries.yml vendored
View File

@ -47,14 +47,14 @@ jobs:
- name: checkout
uses: actions/checkout@v6.0.1
- name: install dependencies for non macos-14
if: inputs.os != 'macos-14'
- name: install dependencies for non macos
if: !startsWith(inputs.os, 'macos')
shell: bash
run: /usr/bin/env python3 -m pip install -r requirements.txt
working-directory: build-scripts
- name: install dependencies for macos-14
if: inputs.os == 'macos-14'
- name: install dependencies for macos
if: startsWith(inputs.os, 'macos')
run: /usr/bin/env python3 -m pip install -r requirements.txt --break-system-packages
working-directory: build-scripts

32
.github/workflows/compilation_on_macos.yml vendored
View File

@ -65,7 +65,7 @@ jobs:
actions: write
uses: ./.github/workflows/build_llvm_libraries.yml
with:
os: "macos-13"
os: "macos-15-intel"
arch: "X86"
build_llvm_libraries_on_arm_macos:
permissions:
@ -73,17 +73,20 @@ jobs:
actions: write
uses: ./.github/workflows/build_llvm_libraries.yml
with:
os: "macos-14"
os: "macos-15"
arch: "AArch64 ARM"
build_wamrc:
needs: [build_llvm_libraries_on_intel_macos]
needs: [build_llvm_libraries_on_intel_macos, build_llvm_libraries_on_arm_macos]
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-15, macos-15-intel]
include:
- os: macos-13
- os: macos-15-intel
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
- os: macos-15
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
steps:
- name: checkout
uses: actions/checkout@v6.0.1
@ -112,7 +115,7 @@ jobs:
working-directory: wamr-compiler
build_iwasm:
needs: [build_llvm_libraries_on_intel_macos]
needs: [build_llvm_libraries_on_intel_macos, build_llvm_libraries_on_arm_macos]
runs-on: ${{ matrix.os }}
strategy:
matrix:
@ -142,7 +145,7 @@ jobs:
"-DWAMR_DISABLE_HW_BOUND_CHECK=1",
"-DWAMR_BUILD_EXTENDED_CONST_EXPR=1",
]
os: [macos-13]
os: [macos-15, macos-15-intel]
platform: [darwin]
exclude:
# incompatible feature and platform
@ -179,7 +182,9 @@ jobs:
- make_options_run_mode: $LLVM_EAGER_JIT_BUILD_OPTIONS
make_options_feature: "-DWAMR_BUILD_MINI_LOADER=1"
include:
- os: macos-13
- os: macos-15
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
- os: macos-15-intel
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
# classic interp doesn't support SIMD
- make_options_run_mode: $CLASSIC_INTERP_BUILD_OPTIONS
@ -218,6 +223,7 @@ jobs:
[
build_iwasm,
build_llvm_libraries_on_intel_macos,
build_llvm_libraries_on_arm_macos,
build_wamrc,
]
runs-on: ${{ matrix.os }}
@ -232,9 +238,11 @@ jobs:
$LLVM_EAGER_JIT_BUILD_OPTIONS,
$MULTI_TIER_JIT_BUILD_OPTIONS,
]
os: [macos-13]
os: [macos-15, macos-15-intel]
include:
- os: macos-13
- os: macos-15
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
- os: macos-15-intel
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
# classic interp doesn't support SIMD
- make_options: $CLASSIC_INTERP_BUILD_OPTIONS
@ -303,11 +311,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [macos-13, macos-14]
os: [macos-15-intel, macos-15]
include:
- os: macos-13
- os: macos-15-intel
llvm_cache_key: ${{ needs.build_llvm_libraries_on_intel_macos.outputs.cache_key }}
- os: macos-14
- os: macos-15
llvm_cache_key: ${{ needs.build_llvm_libraries_on_arm_macos.outputs.cache_key }}
steps:
- name: checkout

15
.github/workflows/release_process.yml vendored
View File

@ -88,6 +88,7 @@ jobs:
os: "ubuntu-22.04"
arch: "AArch64 ARM Mips RISCV X86"
#CLARIFY: Require to build LLVM libraries on ARM macOS?
build_llvm_libraries_on_macos:
permissions:
contents: read
@ -95,7 +96,7 @@ jobs:
needs: [create_tag, create_release]
uses: ./.github/workflows/build_llvm_libraries.yml
with:
os: "macos-13"
os: "macos-15-intel"
arch: "AArch64 ARM Mips RISCV X86"
build_llvm_libraries_on_windows:
@ -122,6 +123,7 @@ jobs:
upload_url: ${{ needs.create_release.outputs.upload_url }}
ver_num: ${{ needs.create_tag.outputs.new_ver }}
#CLARIFY: Require to release wamrc on ARM macOS?
release_wamrc_on_ubuntu_macos:
permissions:
contents: write # upload release artifact
@ -130,7 +132,7 @@ jobs:
with:
llvm_cache_key: ${{ needs.build_llvm_libraries_on_macos.outputs.cache_key }}
release: true
runner: macos-13
runner: macos-15-intel
upload_url: ${{ needs.create_release.outputs.upload_url }}
ver_num: ${{ needs.create_tag.outputs.new_ver }}
@ -160,6 +162,7 @@ jobs:
upload_url: ${{ needs.create_release.outputs.upload_url }}
ver_num: ${{ needs.create_tag.outputs.new_ver}}
#CLARIFY: Require to release iwasm on ARM macOS?
release_iwasm_on_macos:
permissions:
contents: write # upload release artifact
@ -168,7 +171,7 @@ jobs:
with:
cwd: product-mini/platforms/darwin
llvm_cache_key: ${{ needs.build_llvm_libraries_on_macos.outputs.cache_key }}
runner: macos-13
runner: macos-15-intel
upload_url: ${{ needs.create_release.outputs.upload_url }}
ver_num: ${{ needs.create_tag.outputs.new_ver}}
@ -200,6 +203,7 @@ jobs:
wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-linux.tar.gz
wamr_app_framework_url: https://github.com/bytecodealliance/wamr-app-framework.git
#CLARIFY: Require to release WAMR SDK on ARM macOS?
release_wamr_sdk_on_macos:
permissions:
contents: write # upload release artifact
@ -208,7 +212,7 @@ jobs:
uses: ./.github/workflows/build_wamr_sdk.yml
with:
config_file: wamr_config_macos_release.cmake
runner: macos-13
runner: macos-15-intel
upload_url: ${{ needs.create_release.outputs.upload_url }}
ver_num: ${{ needs.create_tag.outputs.new_ver}}
wasi_sdk_url: https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-19/wasi-sdk-19.0-macos.tar.gz
@ -251,6 +255,7 @@ jobs:
upload_url: ${{ needs.create_release.outputs.upload_url }}
ver_num: ${{ needs.create_tag.outputs.new_ver}}
#CLARIFY: Require to release WAMR LLDB on ARM macOS?
release_wamr_lldb_on_macos_universal:
permissions:
contents: write # upload release artifact
@ -258,7 +263,7 @@ jobs:
if: ${{ inputs.release_wamr_lldb }}
uses: ./.github/workflows/build_wamr_lldb.yml
with:
runner: macos-13
runner: macos-15-intel
arch: universal
upload_url: ${{ needs.create_release.outputs.upload_url }}
ver_num: ${{ needs.create_tag.outputs.new_ver}}

5
.github/workflows/wamr_wasi_extensions.yml vendored
View File

@ -27,7 +27,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-22.04, macos-13, macos-14]
os: [ubuntu-22.04, macos-15-intel, macos-15]
steps:
- name: checkout
uses: actions/checkout@v6.0.1
@ -48,8 +48,9 @@ jobs:
./build_samples.sh $(pwd)/dist/wamr-wasi-extensions
working-directory: wamr-wasi-extensions
#CLARIFY: Require to upload artifact on ARM macOS?
- name: Upload artifacts
if: matrix.os == 'macos-14'
if: matrix.os == 'macos-15'
uses: actions/upload-artifact@v6.0.0
with:
name: wamr-wasi-extensions