Skip to content

Commit c5c0dd9

Browse files
authored
Fix binaryen build in build.yml
1 parent 8412711 commit c5c0dd9

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

.github/workflows/build.yml

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,15 @@ jobs:
1515
runs-on: ubuntu-latest
1616
if: github.event_name == 'schedule' || !contains(github.event.head_commit.message, '[ci skip]')
1717
env:
18-
MAKE_FLAGS: "-j2"
1918
CMAKE_EXE_LINKER_FLAGS: "-sMAXIMUM_MEMORY=4294967296 -sSINGLE_FILE"
2019
strategy:
2120
matrix:
2221
emsdk: [ "tot", "latest" ]
2322
fail-fast: false
2423
steps:
25-
- uses: actions/setup-node@v2
24+
- uses: actions/setup-node@v6
2625
with:
27-
node-version: '20'
26+
node-version: '22'
2827
- name: "Set up Emsdk"
2928
run: |
3029
mkdir $HOME/emsdk
@@ -34,12 +33,12 @@ jobs:
3433
$HOME/emsdk/emsdk activate ${{ matrix.emsdk }}
3534
echo "$HOME/emsdk" >> $GITHUB_PATH
3635
- name: "Set up CMake"
37-
run: |
38-
mkdir $HOME/cmake
39-
wget -qO- https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4-Linux-x86_64.tar.gz | tar -xzC $HOME/cmake --strip-components 1
40-
echo "$HOME/cmake/bin" >> $GITHUB_PATH
36+
uses: lukka/get-cmake@v3.31.0
37+
with:
38+
cmakeVersion: 3.30.5
39+
ninjaVersion: latest
4140
- name: "Check out repository"
42-
uses: actions/checkout@v1
41+
uses: actions/checkout@v4
4342
with:
4443
submodules: false
4544
- name: "Set up repository"
@@ -79,12 +78,12 @@ jobs:
7978
fi
8079
- name: "Build binaryen.js"
8180
run: |
82-
mkdir ./binaryen/build
81+
mkdir -p ./binaryen/build
8382
cd ./binaryen/build
8483
source $HOME/emsdk/emsdk_env.sh
8584
emcc --version
86-
emcmake cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS" -DENABLE_WERROR=OFF
87-
emmake make $MAKE_FLAGS binaryen_wasm
85+
emcmake cmake .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS="$CMAKE_EXE_LINKER_FLAGS" -DENABLE_WERROR=OFF
86+
emmake ninja
8887
cd ../..
8988
npm run bundle
9089
- name: "Test binaryen.js"
@@ -95,9 +94,11 @@ jobs:
9594
mkdir -p ./bin
9695
cd ./binaryen/build
9796
source $HOME/emsdk/emsdk_env.sh
98-
emcc --version
9997
for tool in ${{ env.BINARYEN_TOOLS }}; do
100-
emmake make $MAKE_FLAGS "$tool"
98+
if [ ! -f "./bin/$tool.js" ]; then
99+
echo "Missing tool: $tool"
100+
exit 1
101+
fi
101102
echo '#!/usr/bin/env node' > "../../bin/$tool"
102103
cat "./bin/$tool.js" >> "../../bin/$tool"
103104
done

0 commit comments

Comments
 (0)