From 0d693805d702a0c811b58e6b70df64ae8406395c Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sun, 19 Jul 2020 11:10:20 -0700 Subject: [PATCH 1/6] . --- .github/workflows/build_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 4056b0a4b4e..15a7d13552b 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -48,7 +48,7 @@ jobs: run: cmake --build out --config Release - name: strip - run: find bin/ -type f -perm -u=x -exec strip {} + + run: find out/bin/ -type f -perm -u=x -exec strip {} + if: matrix.os != 'windows-latest' - name: archive From 7fe596926d36e4a89bc155c6c15a133db391b3f0 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sun, 19 Jul 2020 11:26:48 -0700 Subject: [PATCH 2/6] . --- .github/workflows/build_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 15a7d13552b..ebaa7bd3773 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -115,7 +115,7 @@ jobs: - name: cmake run: | - ./alpine.sh cmake . -G Ninja -DCMAKE_CXX_FLAGS="-static" -DCMAKE_C_FLAGS="-static" -DCMAKE_BUILD_TYPE=Release + ./alpine.sh cmake . -G Ninja -DCMAKE_CXX_FLAGS="-static" -DCMAKE_C_FLAGS="-static" -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC_LIB=ON - name: build run: | From b28d6875913b4ddbe09e1e38e0395322fde4387e Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sun, 19 Jul 2020 11:30:12 -0700 Subject: [PATCH 3/6] . --- .github/workflows/ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 05d080be97d..88f8fd7b79d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,8 +77,11 @@ jobs: - name: build run: cmake --build out --config Release + - name: install + run: cmake --install out --config Release + - name: strip - run: find out/bin/ -type f -perm -u=x -exec strip {} + + run: find out/install/ -type f -perm -u=x -exec strip {} + if: matrix.os != 'windows-latest' - name: test @@ -91,7 +94,7 @@ jobs: uses: actions/upload-artifact@v1 with: name: build-${{ matrix.os }} - path: out/bin + path: out/install build-clang: name: clang From 3ffa6a678daa350a7149422c80fbbb8260528301 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sun, 19 Jul 2020 11:40:01 -0700 Subject: [PATCH 4/6] . --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88f8fd7b79d..c58871c9321 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,16 +62,16 @@ jobs: run: mkdir -p out - name: cmake (linux) - run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release + run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out/install if: matrix.os == 'ubuntu-latest' - name: cmake (osx) - run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release + run: cmake -S . -B out -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=out/install if: matrix.os == 'macos-latest' - name: cmake (win) # -G "Visual Studio 15 2017" - run: cmake -S . -B out + run: cmake -S . -B out -DCMAKE_INSTALL_PREFIX=out/install if: matrix.os == 'windows-latest' - name: build @@ -84,18 +84,18 @@ jobs: run: find out/install/ -type f -perm -u=x -exec strip {} + if: matrix.os != 'windows-latest' - - name: test - run: python check.py --binaryen-bin=out/bin - # Currently disabled on windows due to a single test failure. - # https://github.com/WebAssembly/binaryen/issues/2781 - if: matrix.os != 'windows-latest' - - name: Upload artifacts uses: actions/upload-artifact@v1 with: name: build-${{ matrix.os }} path: out/install + - name: test + run: python check.py --binaryen-bin=out/install/bin + # Currently disabled on windows due to a single test failure. + # https://github.com/WebAssembly/binaryen/issues/2781 + if: matrix.os != 'windows-latest' + build-clang: name: clang runs-on: ubuntu-latest From 627ea531db21f56f2049681ef9c76307f42b475a Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sun, 19 Jul 2020 11:48:04 -0700 Subject: [PATCH 5/6] . --- .github/workflows/build_release.yml | 2 +- .github/workflows/ci.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index ebaa7bd3773..c061d0508df 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -48,7 +48,7 @@ jobs: run: cmake --build out --config Release - name: strip - run: find out/bin/ -type f -perm -u=x -exec strip {} + + run: find out/bin/ -type f -perm -u=x -exec strip -x {} + if: matrix.os != 'windows-latest' - name: archive diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c58871c9321..046e60ed46c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -81,7 +81,7 @@ jobs: run: cmake --install out --config Release - name: strip - run: find out/install/ -type f -perm -u=x -exec strip {} + + run: find out/install/ -type f -perm -u=x -exec strip -x {} + if: matrix.os != 'windows-latest' - name: Upload artifacts From 098f48a4bd00c801db0608370ff512e7e392a489 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Sun, 19 Jul 2020 12:00:38 -0700 Subject: [PATCH 6/6] . --- .github/workflows/build_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index c061d0508df..f3b72b9d362 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -131,7 +131,7 @@ jobs: PKGNAME="binaryen-$VERSION-x86_64-linux" TARBALL=$PKGNAME.tar.gz SHASUM=$PKGNAME.tar.gz.sha256 - ./alpine find bin/ -type f -perm -u=x -exec strip {} + + ./alpine.sh find bin/ -type f -perm -u=x -exec strip {} + mv bin binaryen-$VERSION tar -czf $TARBALL binaryen-$VERSION shasum -a 256 $TARBALL > $SHASUM