Skip to content

Commit 10d6f31

Browse files
authored
Rework buildbinary workflow to only use ubuntu.
1 parent e620075 commit 10d6f31

File tree

1 file changed

+15
-24
lines changed

1 file changed

+15
-24
lines changed

.github/workflows/buildbinaryen.yml

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,26 @@ jobs:
88
strategy:
99
matrix:
1010
include:
11-
- os: windows-latest
12-
arch: x64
13-
cmake-args: -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
14-
runtime: win-x64
15-
- os: windows-latest
16-
arch: x86
17-
cmake-args: -DCMAKE_C_COMPILER=i686-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
18-
runtime: win-x86
1911
- os: ubuntu-latest
2012
arch: x64
13+
target: linux
2114
cmake-args: -DCMAKE_C_FLAGS="-m64 -w -static-libgcc -static-libstdc++" -DCMAKE_CXX_FLAGS="-m64 -w -static-libgcc -static-libstdc++" -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
2215
runtime: linux-x64
2316
- os: ubuntu-latest
2417
arch: x86
18+
target: linux
2519
cmake-args: -DCMAKE_C_FLAGS="-m32 -w -static-libgcc -static-libstdc++" -DCMAKE_CXX_FLAGS="-m32 -w -static-libgcc -static-libstdc++" -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
2620
runtime: linux-x86
21+
- os: ubuntu-latest
22+
arch: x64
23+
target: windows
24+
cmake-args: -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
25+
runtime: win-x64
26+
- os: ubuntu-latest
27+
arch: x86
28+
target: windows
29+
cmake-args: -DCMAKE_C_COMPILER=i686-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=i686-w64-mingw32-g++ -DBUILD_SHARED_LIBS=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
30+
runtime: win-x86
2731

2832
runs-on: ${{ matrix.os }}
2933

@@ -32,29 +36,16 @@ jobs:
3236
with:
3337
submodules: recursive
3438

35-
- name: Install build deps (Linux)
36-
if: runner.os == 'Linux'
39+
- name: Install build dependencies
3740
run: |
3841
sudo apt-get update
39-
sudo apt-get install -y g++-multilib gcc-multilib cmake make
40-
41-
- name: Install MinGW (Windows)
42-
if: runner.os == 'Windows'
43-
run: |
44-
choco install mingw -y
45-
refreshenv
42+
sudo apt-get install -y g++-multilib gcc-multilib cmake make mingw-w64
4643
4744
- name: Configure
4845
run: cmake -S binaryen -B binaryen/build ${{ matrix.cmake-args }}
4946

50-
- name: Build (Linux)
51-
if: runner.os == 'Linux'
47+
- name: Build
5248
run: cmake --build binaryen/build -- -j$(nproc)
53-
54-
- name: Build (Windows)
55-
if: runner.os == 'Windows'
56-
run: cmake --build binaryen/build -- -j $Env:NUMBER_OF_PROCESSORS
57-
shell: pwsh
5849

5950
- name: Copy to NuGet runtime folder
6051
run: |

0 commit comments

Comments
 (0)