Skip to content

Commit

Permalink
Upgrade to emsdk to version 3.1.73 (#456)
Browse files Browse the repository at this point in the history
  • Loading branch information
mcbarton authored Feb 2, 2025
1 parent 490dfcb commit a901f57
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.45"
emsdk_ver: "3.1.73"

steps:
- uses: actions/checkout@v4
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/emscripten.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@ jobs:
cling: Off
llvm_enable_projects: "clang;lld"
llvm_targets_to_build: "WebAssembly"
emsdk_ver: "3.1.45"
- name: ubu24-x86-gcc12-clang-repl-19-emscripten
os: ubuntu-24.04
compiler: gcc-12
clang-runtime: '19'
cling: Off
llvm_enable_projects: "clang;lld"
llvm_targets_to_build: "WebAssembly"
emsdk_ver: "3.1.45"
emsdk_ver: "3.1.73"
- name: osx15-arm-clang-clang-repl-19-emscripten
os: macos-15
compiler: clang
clang-runtime: '19'
cling: Off
llvm_enable_projects: "clang;lld"
llvm_targets_to_build: "WebAssembly"
emsdk_ver: "3.1.73"
- name: ubu24-x86-gcc12-clang-repl-19-emscripten
os: ubuntu-24.04
compiler: gcc-12
clang-runtime: '19'
cling: Off
llvm_enable_projects: "clang;lld"
llvm_targets_to_build: "WebAssembly"
emsdk_ver: "3.1.45"
emsdk_ver: "3.1.73"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -465,21 +465,21 @@ jobs:
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.45"
- name: ubu24-arm-gcc12-clang-repl-19-emscripten_wasm
os: ubuntu-24.04-arm
compiler: gcc-12
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.45"
emsdk_ver: "3.1.73"
- name: osx15-arm-clang-clang-repl-19-emscripten_wasm
os: macos-15
compiler: clang
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.45"
emsdk_ver: "3.1.73"
- name: ubu24-arm-gcc12-clang-repl-19-emscripten_wasm
os: ubuntu-24.04-arm
compiler: gcc-12
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.73"

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 3 additions & 3 deletions Emscripten-build-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ cd ./CppInterOp-wasm
```

To create a wasm build of CppInterOp we make use of the emsdk toolchain. This can be installed by executing (we only currently
support version 3.1.45)
support version 3.1.73)
```bash
git clone https://github.com/emscripten-core/emsdk.git
./emsdk/emsdk install 3.1.45
./emsdk/emsdk install 3.1.73
```

and activate the emsdk environment

```bash
./emsdk/emsdk activate 3.1.45
./emsdk/emsdk activate 3.1.73
source ./emsdk/emsdk_env.sh
```

Expand Down
6 changes: 3 additions & 3 deletions docs/Emscripten-build-instructions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ Now move into this directory using the following command
To create a wasm build of CppInterOp we make use of the emsdk toolchain.
This can be installed by executing (we only currently support version
3.1.45)
3.1.73)

.. code:: bash
git clone https://github.com/emscripten-core/emsdk.git
./emsdk/emsdk install 3.1.45
./emsdk/emsdk install 3.1.73
and activate the emsdk environment

.. code:: bash
./emsdk/emsdk activate 3.1.45
./emsdk/emsdk activate 3.1.73
source ./emsdk/emsdk_env.sh
Now clone the 19.x release of the LLVM project repository and CppInterOp
Expand Down
3 changes: 2 additions & 1 deletion environment-wasm.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: CppInterOp-wasm
channels:
- https://repo.mamba.pm/emscripten-forge
- https://repo.prefix.dev/emscripten-forge-dev
dependencies:
- emscripten-abi==3.1.73
- nlohmann_json
- xeus-lite
- xeus
Expand Down

0 comments on commit a901f57

Please sign in to comment.