Skip to content
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

Upgrade to emsdk to version 3.1.73 #456

Merged
merged 3 commits into from
Feb 2, 2025
Merged

Upgrade to emsdk to version 3.1.73 #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65c989e
Upgrade to emsdk to version 3.1.73
mcbarton Jan 16, 2025
c2be16f
Merge branch 'main' into Upgrade-to-emsdk-3.1.73
mcbarton Jan 30, 2025
4817bab
Update environment-wasm.yml
mcbarton Jan 30, 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
2 changes: 1 addition & 1 deletion .github/workflows/deploy-pages.yml
View file
Open in desktop
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"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can completely be removed once the above comment is addressed

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similarly for docs and the main.yml. We wouldn't need to store this in a variable !


steps:
- uses: actions/checkout@v4
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/emscripten.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading