From 65c989e26217c346883b9aa5efc17e6f4685785c Mon Sep 17 00:00:00 2001 From: mcbarton <150042563+mcbarton@users.noreply.github.com> Date: Thu, 16 Jan 2025 20:57:05 +0000 Subject: [PATCH 1/2] Upgrade to emsdk to version 3.1.73 --- .github/workflows/deploy-pages.yml | 2 +- .github/workflows/emscripten.yml | 12 ++++++------ Emscripten-build-instructions.md | 6 +++--- docs/Emscripten-build-instructions.rst | 6 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml index ef9317f82..511afac82 100644 --- a/.github/workflows/deploy-pages.yml +++ b/.github/workflows/deploy-pages.yml @@ -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 diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml index 28fcfd468..9627f878d 100644 --- a/.github/workflows/emscripten.yml +++ b/.github/workflows/emscripten.yml @@ -28,7 +28,7 @@ jobs: 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 @@ -36,7 +36,7 @@ jobs: cling: Off llvm_enable_projects: "clang;lld" llvm_targets_to_build: "WebAssembly" - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" - name: osx13-x86-clang-clang-repl-19-emscripten os: macos-13 compiler: clang @@ -44,7 +44,7 @@ jobs: 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 @@ -450,21 +450,21 @@ jobs: 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: osx13-x86-clang-clang-repl-19-emscripten_wasm os: macos-13 compiler: clang clang-runtime: '19' cling: Off micromamba_shell_init: bash - emsdk_ver: "3.1.45" + emsdk_ver: "3.1.73" steps: - uses: actions/checkout@v4 diff --git a/Emscripten-build-instructions.md b/Emscripten-build-instructions.md index 301e487cb..5a50e71e9 100644 --- a/Emscripten-build-instructions.md +++ b/Emscripten-build-instructions.md @@ -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 ``` diff --git a/docs/Emscripten-build-instructions.rst b/docs/Emscripten-build-instructions.rst index 9eb7c2684..7b76bc303 100644 --- a/docs/Emscripten-build-instructions.rst +++ b/docs/Emscripten-build-instructions.rst @@ -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 From 4817bab684808d8a6a6b40834cb0b580be3e347a Mon Sep 17 00:00:00 2001 From: mcbarton Date: Thu, 30 Jan 2025 21:54:17 +0000 Subject: [PATCH 2/2] Update environment-wasm.yml --- environment-wasm.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environment-wasm.yml b/environment-wasm.yml index e52858221..4db4342d8 100644 --- a/environment-wasm.yml +++ b/environment-wasm.yml @@ -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