Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,22 +20,22 @@ jobs:
run: |
mkdir $HOME/emsdk
git clone --depth 1 https://github.com/emscripten-core/emsdk.git $HOME/emsdk
$HOME/emsdk/emsdk install 3.1.47
$HOME/emsdk/emsdk activate 3.1.47
$HOME/emsdk/emsdk install 4.0.19
$HOME/emsdk/emsdk activate 4.0.19
echo "$HOME/emsdk" >> $GITHUB_PATH

- name: "Set up CMake"
run: |
mkdir $HOME/cmake
wget -qO- https://github.com/Kitware/CMake/releases/download/v3.21.4/cmake-3.21.4-Linux-x86_64.tar.gz | tar -xzC $HOME/cmake --strip-components 1
wget -qO- https://github.com/Kitware/CMake/releases/download/v4.1.2/cmake-4.1.2-Linux-x86_64.tar.gz | tar -xzC $HOME/cmake --strip-components 1
echo "$HOME/cmake/bin" >> $GITHUB_PATH

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

- name: "Build binaryen.es5.js"
- name: "Build binaryen.js"
run: |
mkdir ./binaryen/build
cd ./binaryen/build
Expand All @@ -44,7 +44,7 @@ jobs:
emcmake cmake .. -DCMAKE_BUILD_TYPE=Release -DJS_OF_OCAML=ON -DBUILD_TOOLS=OFF -DBUILD_TESTS=OFF
emmake make -j2 binaryen_js
cd ../..
mv ./binaryen/build/bin/binaryen_js.js binaryen.es5.js
mv ./binaryen/build/bin/binaryen_js.js binaryen.js

# Setup a "bot" name & email for our commit step
# using the GitHub Actions bot user: https://github.community/t/github-actions-bot-email-address/17204/6
Expand All @@ -54,8 +54,8 @@ jobs:
git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com

# Only commit if there's a change. Ref https://stackoverflow.com/a/8123841
- name: Commit binaryen.es5.js
- name: Commit binaryen.js
run: |
git add binaryen.es5.js
git diff-index --quiet HEAD || git commit -m 'chore: Rebuild binaryen.es5.js'
git add binaryen.js
git diff-index --quiet HEAD || git commit -m 'chore: Rebuild binaryen.js'
git push
2 changes: 1 addition & 1 deletion binaryen
Submodule binaryen updated 1 files
+1 −10 CMakeLists.txt
758 changes: 358 additions & 400 deletions binaryen.es5.js → binaryen.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dune
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
(c_library_flags :standard -lstdc++ -lpthread)
(install_c_headers binaryen-c)
(js_of_ocaml
(javascript_files binaryen.es5.js)))
(javascript_files binaryen.js)))

(install
(section lib)
Expand Down
5 changes: 2 additions & 3 deletions test/dune
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
(= %{bin-available:node} true))
(modules test)
(libraries binaryen)
(modes exe js)
(modes js)
(action (run node %{test} --input-type=module))
(flags
:standard
(:include ./config/flags.sexp))
Expand All @@ -28,8 +29,6 @@

(test
(name test_no_js)
(enabled_if
(= %{bin-available:node} false))
(modules test_no_js)
(libraries binaryen)
(modes exe)
Expand Down
Loading