Skip to content

feat: Update libbinaryen v117 for [email protected] and ocaml 5 #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: v117_1_0
Choose a base branch
from
Open

feat: Update libbinaryen v117 for [email protected] and ocaml 5 #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce44557
feat: Apply patch for [email protected]
spotandjake May 19, 2025
59bc7b8
feat: Use `macos-14`
spotandjake Sep 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions .github/workflows/esy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,25 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
# Using macos-14 to avoid issues with clang-17 provided by macos-15
os: [ubuntu-latest, macos-14, windows-latest]

steps:
- name: Setup node.js
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with:
node-version: "16"
node-version: "22"
check-latest: true

# Install `esy` to build the project
# It also adds `shx` globally for cross-platform shell commands
- name: Setup environment
run: |
npm i -g esy@0.6.12
npm i -g esy@0.8.0
npm i -g shx

- name: Checkout project
uses: actions/checkout@v3.5.3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: "recursive"

Expand All @@ -38,7 +39,7 @@ jobs:

- name: Esy cache
id: esy-cache
uses: actions/cache@v3.3.1
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
with:
path: _export
key: ${{ runner.os }}-esy-${{ hashFiles('esy.lock/index.json') }}
Expand Down Expand Up @@ -77,4 +78,4 @@ jobs:

- name: Run tests
run: |
esy test
esy test
8 changes: 4 additions & 4 deletions .github/workflows/js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ jobs:

steps:
- name: Setup node.js
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with:
node-version: "16"
node-version: "22"
check-latest: true

- name: "Set up emsdk"
Expand All @@ -31,7 +31,7 @@ jobs:
echo "$HOME/cmake/bin" >> $GITHUB_PATH

- name: Checkout project
uses: actions/checkout@v3.5.3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: "recursive"

Expand All @@ -58,4 +58,4 @@ jobs:
run: |
git add binaryen.es5.js
git diff-index --quiet HEAD || git commit -m 'chore: Rebuild binaryen.es5.js'
git push
git push
31 changes: 14 additions & 17 deletions .github/workflows/opam.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,24 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, macos-latest, windows-latest]
ocaml-compiler: [4.12.1, 4.13.1, 4.14.1]
# Using macos-14 to avoid issues with clang-17 provided by macos-15
os: [ubuntu-latest, macos-14, windows-latest]
ocaml-compiler: [4.13.1, 4.14.1, 5.3.0]

steps:
- name: Checkout project
uses: actions/[email protected]
- name: Setup node.js
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with:
submodules: "recursive"
node-version: "22"
check-latest: true

- name: Setup OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v2
if: ${{ startsWith(matrix.os, 'windows-') }}
- name: Checkout project
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}
opam-repositories: |
opam-repository-mingw: https://github.com/ocaml-opam/opam-repository-mingw.git#sunset
default: https://github.com/ocaml/opam-repository.git
submodules: "recursive"

- name: Setup OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v2
if: ${{ !startsWith(matrix.os, 'windows-') }}
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}

Expand Down Expand Up @@ -71,12 +68,12 @@ jobs:
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100

- name: Checkout project
uses: actions/checkout@v3.5.3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: "recursive"

- name: Setup OCaml ${{ matrix.ocaml-compiler }}
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
with:
ocaml-compiler: ${{ matrix.ocaml-compiler }}

Expand All @@ -95,4 +92,4 @@ jobs:
run: opam exec -- dune build

- name: Run tests
run: opam exec -- dune runtest --display=short
run: opam exec -- dune runtest --display=short
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
brew install git-archive-all

- name: Checkout code
uses: actions/checkout@v3.5.3
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
submodules: "recursive"

Expand Down Expand Up @@ -82,7 +82,7 @@ jobs:
echo -n "$CHANGES" > CHANGES.md

- name: Setup OCaml
uses: ocaml/setup-ocaml@v2
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
with:
ocaml-compiler: 4.14.0

Expand All @@ -100,9 +100,9 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Setup NodeJS
uses: actions/setup-node@v3.6.0
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
with:
node-version: "16"
node-version: "22"
registry-url: "https://registry.npmjs.org"

- name: Publish to npm
Expand Down
7 changes: 5 additions & 2 deletions dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
-G
"Unix Makefiles"
; GCC 7 (shipped with esy) doesn't like _ for unused variables
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized"
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized -Wno-stringop-overread"
-DBUILD_TESTS=OFF
-DBUILD_TOOLS=OFF
-DBUILD_STATIC_LIB=ON
Expand Down Expand Up @@ -125,8 +125,11 @@
binaryen
-G
"Unix Makefiles"
-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc
-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++
"-DCMAKE_SYSTEM_NAME=Windows"
; GCC 7 (shipped with esy) doesn't like _ for unused variables
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized"
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized -Wno-stringop-overread"
-DBUILD_TESTS=OFF
-DBUILD_TOOLS=OFF
-DCMAKE_SHARED_LIBRARY_PREFIX_CXX=lib
Expand Down
Loading