From 033ee955557a7a7eb663e973e39af7499bf81695 Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 17 Apr 2025 19:37:46 +0100 Subject: [PATCH 01/10] Add Windows 11 arm to ci --- .github/workflows/ci.yml | 15 +++++++++------ .github/workflows/create_release.yml | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e54a7e494ae..d20104e0f14 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest] + os: [ubuntu-latest, macos-latest, windows-latest,windows-11-arm] steps: - uses: actions/setup-python@v5 with: @@ -77,7 +77,7 @@ jobs: - name: install ninja (win) run: choco install ninja - if: matrix.os == 'windows-latest' + if: startsWith(matrix.os, 'windows') - name: install v8 run: | @@ -98,7 +98,7 @@ jobs: - name: cmake (win) # -G "Visual Studio 15 2017" run: cmake -S . -B out -DCMAKE_INSTALL_PREFIX=out/install - if: matrix.os == 'windows-latest' + if: startsWith(matrix.os, 'windows') - name: build run: cmake --build out --config Release -v @@ -108,7 +108,7 @@ jobs: - name: strip run: find out/install/ -type f -perm -u=x -exec strip -x {} + - if: matrix.os != 'windows-latest' + if: ${{ !startsWith(matrix.os, 'windows') }} - name: Upload artifacts uses: actions/upload-artifact@v4 @@ -368,8 +368,11 @@ jobs: # Windows + gcc needs work before the tests will run, so just test the compile build-mingw: - name: mingw - runs-on: windows-latest + name: mingw-${{ matrix.os }} + runs-on: ${{ matrix.os }} + strategy: + matrix: + os: [windows-latest,windows-11-arm] steps: - uses: actions/setup-python@v5 with: diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 143f0300451..30be40abf81 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, windows-latest] + os: [macos-latest, windows-latest,windows-11-arm] defaults: run: shell: bash @@ -31,7 +31,7 @@ jobs: - name: install ninja (win) run: choco install ninja - if: matrix.os == 'windows-latest' + if: startsWith(matrix.os, 'windows') - name: mkdir run: mkdir -p out @@ -45,7 +45,7 @@ jobs: - name: cmake (win) # -G "Visual Studio 15 2017" run: cmake -S . -B out -DCMAKE_INSTALL_PREFIX=out/install - if: matrix.os == 'windows-latest' + if: startsWith(matrix.os, 'windows') - name: build run: cmake --build out -v --config Release --target install @@ -56,7 +56,7 @@ jobs: - name: strip run: find out*/install/ -type f -perm -u=x -exec strip -x {} + - if: matrix.os != 'windows-latest' + if: ${{ !startsWith(matrix.os, 'windows') }} - name: archive id: archive From c8a166a06028fa815fd7439d22739203fcefcd99 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Sat, 19 Apr 2025 21:05:14 +0100 Subject: [PATCH 02/10] Try to fix release workflow --- .github/workflows/create_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 30be40abf81..b5f07b33ecf 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -89,7 +89,7 @@ jobs: cmake -E sha256sum $TARBALL > $SHASUM echo "TARBALL=$TARBALL" >> $GITHUB_OUTPUT echo "SHASUM=$SHASUM" >> $GITHUB_OUTPUT - if: matrix.os == 'macos-latest' + if: ${{ matrix.os == 'macos-latest' || matrix.os == 'windows-11-arm' }} - name: upload tarball uses: softprops/action-gh-release@v1 From 5d515e6fda1f06f64892fa9afb908cce233e7722 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Sat, 19 Apr 2025 21:22:23 +0100 Subject: [PATCH 03/10] Try to fix release workflow --- .github/workflows/create_release.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index b5f07b33ecf..2d8377699f9 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -45,7 +45,12 @@ jobs: - name: cmake (win) # -G "Visual Studio 15 2017" run: cmake -S . -B out -DCMAKE_INSTALL_PREFIX=out/install - if: startsWith(matrix.os, 'windows') + if: matrix.os == 'windows-latest' + + - name: cmake (win arm64) + # -G "Visual Studio 15 2017" + run: cmake -S . -B out -DCMAKE_INSTALL_PREFIX=out-arm64/install + if: matrix.os == 'windows-11-arm' - name: build run: cmake --build out -v --config Release --target install From a0bfb70e13c10a3dd93921dc2b92e01ac8994791 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Sat, 19 Apr 2025 22:05:07 +0100 Subject: [PATCH 04/10] Try to fix release workflow --- .github/workflows/create_release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 2d8377699f9..3f91aa7bfe6 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -78,6 +78,7 @@ jobs: cmake -E sha256sum $TARBALL > $SHASUM echo "TARBALL=$TARBALL" >> $GITHUB_OUTPUT echo "SHASUM=$SHASUM" >> $GITHUB_OUTPUT + if: ${{ matrix.os != 'macos-latest' & matrix.os != 'windows-11-arm' }} - name: archive-arm64 id: archive-arm64 From 89c5bb3315802352eac9c3a5084dea54a00af1c3 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Sat, 19 Apr 2025 22:08:09 +0100 Subject: [PATCH 05/10] Update create_release.yml --- .github/workflows/create_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 3f91aa7bfe6..3406cad1267 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -78,7 +78,7 @@ jobs: cmake -E sha256sum $TARBALL > $SHASUM echo "TARBALL=$TARBALL" >> $GITHUB_OUTPUT echo "SHASUM=$SHASUM" >> $GITHUB_OUTPUT - if: ${{ matrix.os != 'macos-latest' & matrix.os != 'windows-11-arm' }} + if: ${{ matrix.os != 'macos-latest' && matrix.os != 'windows-11-arm' }} - name: archive-arm64 id: archive-arm64 From a34728d516bb1e2084fdeff37574f46e62ea90a3 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Sat, 19 Apr 2025 22:23:14 +0100 Subject: [PATCH 06/10] Update create_release.yml --- .github/workflows/create_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 3406cad1267..699f8f86e4e 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -83,7 +83,7 @@ jobs: - name: archive-arm64 id: archive-arm64 run: | - OSNAME=$(echo ${{ matrix.os }} | sed 's/-latest//') + OSNAME=$(echo ${{ matrix.os }} | sed 's/-latest//' | sed 's/-11-arm//') VERSION=$GITHUB_REF_NAME PKGNAME="binaryen-$VERSION-arm64-$OSNAME" TARBALL=$PKGNAME.tar.gz From e5e72faa632882fe4195297bed9e74d591c74a00 Mon Sep 17 00:00:00 2001 From: mcbarton Date: Sat, 19 Apr 2025 22:45:08 +0100 Subject: [PATCH 07/10] Update create_release.yml --- .github/workflows/create_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index 699f8f86e4e..bf4a89cc839 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -78,7 +78,7 @@ jobs: cmake -E sha256sum $TARBALL > $SHASUM echo "TARBALL=$TARBALL" >> $GITHUB_OUTPUT echo "SHASUM=$SHASUM" >> $GITHUB_OUTPUT - if: ${{ matrix.os != 'macos-latest' && matrix.os != 'windows-11-arm' }} + if: matrix.os != 'windows-11-arm' - name: archive-arm64 id: archive-arm64 From 6658bcc05d2c695a9fc9b5dae8ed623a9dfae9ef Mon Sep 17 00:00:00 2001 From: mcbarton Date: Tue, 22 Apr 2025 11:12:39 +0100 Subject: [PATCH 08/10] Update .github/workflows/ci.yml Co-authored-by: Alon Zakai --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d20104e0f14..d27af21947d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,7 +51,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, macos-latest, windows-latest,windows-11-arm] + os: [ubuntu-latest, macos-latest, windows-latest, windows-11-arm] steps: - uses: actions/setup-python@v5 with: From 4ae8668e46ab193beebb4ec83ef8eee0922256bd Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 23 Apr 2025 20:10:48 +0100 Subject: [PATCH 09/10] Apply PR suggestions --- .github/workflows/ci.yml | 2 +- .github/workflows/create_release.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d27af21947d..60a96248886 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -372,7 +372,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest,windows-11-arm] + os: [windows-latest, windows-11-arm] steps: - uses: actions/setup-python@v5 with: diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index bf4a89cc839..b5617b7aead 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -16,7 +16,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-latest, windows-latest,windows-11-arm] + os: [macos-latest, windows-latest, windows-11-arm] defaults: run: shell: bash @@ -61,7 +61,7 @@ jobs: - name: strip run: find out*/install/ -type f -perm -u=x -exec strip -x {} + - if: ${{ !startsWith(matrix.os, 'windows') }} + if: !startsWith(matrix.os, 'windows') - name: archive id: archive From 861c270de7a3386f0b055a1654f2dc0b38dfbd9b Mon Sep 17 00:00:00 2001 From: mcbarton Date: Wed, 23 Apr 2025 20:15:11 +0100 Subject: [PATCH 10/10] Revert change --- .github/workflows/create_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create_release.yml b/.github/workflows/create_release.yml index b5617b7aead..7d6bb6ed74b 100644 --- a/.github/workflows/create_release.yml +++ b/.github/workflows/create_release.yml @@ -61,7 +61,7 @@ jobs: - name: strip run: find out*/install/ -type f -perm -u=x -exec strip -x {} + - if: !startsWith(matrix.os, 'windows') + if: ${{ !startsWith(matrix.os, 'windows') }} - name: archive id: archive