Skip to content

Commit 7465911

Browse files
authored
feat: Update libbinaryen v119 for [email protected] and ocaml 5 (#122)
This is a similar update for v119 as we did for v117
1 parent ffd37fc commit 7465911

File tree

76 files changed

+1522
-1336
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+1522
-1336
lines changed

.github/workflows/esy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,20 @@ jobs:
1515

1616
steps:
1717
- name: Setup node.js
18-
uses: actions/setup-node@v3.6.0
18+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1919
with:
20-
node-version: "16"
20+
node-version: "22"
2121
check-latest: true
2222

2323
# Install `esy` to build the project
2424
# It also adds `shx` globally for cross-platform shell commands
2525
- name: Setup environment
2626
run: |
27-
npm i -g esy@0.6.12
27+
npm i -g esy@0.8.0
2828
npm i -g shx
2929
3030
- name: Checkout project
31-
uses: actions/checkout@v3.5.3
31+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3232
with:
3333
submodules: "recursive"
3434

@@ -38,7 +38,7 @@ jobs:
3838
3939
- name: Esy cache
4040
id: esy-cache
41-
uses: actions/cache@v3.3.1
41+
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4.2.3
4242
with:
4343
path: _export
4444
key: ${{ runner.os }}-esy-${{ hashFiles('esy.lock/index.json') }}

.github/workflows/js.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ jobs:
1111

1212
steps:
1313
- name: Setup node.js
14-
uses: actions/setup-node@v3.6.0
14+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
1515
with:
16-
node-version: "16"
16+
node-version: "22"
1717
check-latest: true
1818

1919
- name: "Set up emsdk"
@@ -31,7 +31,7 @@ jobs:
3131
echo "$HOME/cmake/bin" >> $GITHUB_PATH
3232
3333
- name: Checkout project
34-
uses: actions/checkout@v3.5.3
34+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
with:
3636
submodules: "recursive"
3737

.github/workflows/opam.yml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,23 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
os: [ubuntu-22.04, macos-latest, windows-latest]
15-
ocaml-compiler: [4.12.1, 4.13.1, 4.14.1]
14+
os: [ubuntu-latest, macos-latest, windows-latest]
15+
ocaml-compiler: [4.13.1, 4.14.1, 5.3.0]
1616

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

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

3229
- name: Setup OCaml ${{ matrix.ocaml-compiler }}
33-
uses: ocaml/setup-ocaml@v2
34-
if: ${{ !startsWith(matrix.os, 'windows-') }}
30+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
3531
with:
3632
ocaml-compiler: ${{ matrix.ocaml-compiler }}
3733

@@ -71,12 +67,12 @@ jobs:
7167
sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-10 100
7268
7369
- name: Checkout project
74-
uses: actions/checkout@v3.5.3
70+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7571
with:
7672
submodules: "recursive"
7773

7874
- name: Setup OCaml ${{ matrix.ocaml-compiler }}
79-
uses: ocaml/setup-ocaml@v2
75+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
8076
with:
8177
ocaml-compiler: ${{ matrix.ocaml-compiler }}
8278

.github/workflows/release.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
brew install git-archive-all
3535
3636
- name: Checkout code
37-
uses: actions/checkout@v3.5.3
37+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3838
with:
3939
submodules: "recursive"
4040

@@ -82,7 +82,7 @@ jobs:
8282
echo -n "$CHANGES" > CHANGES.md
8383
8484
- name: Setup OCaml
85-
uses: ocaml/setup-ocaml@v2
85+
uses: ocaml/setup-ocaml@c2e6bb92370612b89f302c3aaefa1da45ee2d702 # v3.2.15
8686
with:
8787
ocaml-compiler: 4.14.0
8888

@@ -100,9 +100,9 @@ jobs:
100100
runs-on: ubuntu-22.04
101101
steps:
102102
- name: Setup NodeJS
103-
uses: actions/setup-node@v3.6.0
103+
uses: actions/setup-node@cdca7365b2dadb8aad0a33bc7601856ffabcc48e # v4.3.0
104104
with:
105-
node-version: "16"
105+
node-version: "22"
106106
registry-url: "https://registry.npmjs.org"
107107

108108
- name: Publish to npm

dune

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
-G
4141
"Unix Makefiles"
4242
; GCC 7 (shipped with esy) doesn't like _ for unused variables
43-
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized"
43+
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized -Wno-stringop-overread"
44+
; Clang 17 seems to trigger `-unused-but-set-variable` and `-Werror` overrides `-Wno-unused-but-set-variable`
45+
-DENABLE_WERROR=OFF
4446
-DBUILD_TESTS=OFF
4547
-DBUILD_TOOLS=OFF
4648
-DBUILD_STATIC_LIB=ON
@@ -69,6 +71,8 @@
6971
"Unix Makefiles"
7072
; GCC 7 (shipped with esy) doesn't like _ for unused variables
7173
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized"
74+
; Clang 17 seems to trigger `-unused-but-set-variable` and `-Werror` overrides `-Wno-unused-but-set-variable`
75+
-DENABLE_WERROR=OFF
7276
-DBUILD_TESTS=OFF
7377
-DBUILD_TOOLS=OFF
7478
-DBUILD_STATIC_LIB=OFF
@@ -125,8 +129,11 @@
125129
binaryen
126130
-G
127131
"Unix Makefiles"
132+
-DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc
133+
-DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++
134+
"-DCMAKE_SYSTEM_NAME=Windows"
128135
; GCC 7 (shipped with esy) doesn't like _ for unused variables
129-
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized"
136+
"-DCMAKE_CXX_FLAGS=-Wno-unused-variable -Wno-maybe-uninitialized -Wno-stringop-overread"
130137
-DBUILD_TESTS=OFF
131138
-DBUILD_TOOLS=OFF
132139
-DCMAKE_SHARED_LIBRARY_PREFIX_CXX=lib

0 commit comments

Comments
 (0)