Skip to content

Commit dd905d0

Browse files
committed
fix: update macOS setup steps to reflect new OS versions and improve clarity
1 parent a18aef6 commit dd905d0

2 files changed

Lines changed: 11 additions & 11 deletions

File tree

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/checkout@v6.0.1
4949

5050
- name: install dependencies for non macos
51-
if: !startsWith(inputs.os, '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

0 commit comments

Comments
 (0)