Merge branch 'main' into Update-to-llvm-20

Author: mcbarton

.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

.github/workflows/emscripten.yml

@@ -29,17 +29,17 @@ jobs:
             llvm_enable_projects: "clang;lld"
             llvm_targets_to_build: "WebAssembly"
             emsdk_ver: "3.1.73"
-          - name: ubu24-x86-gcc12-clang-repl-20-emscripten
-            os: ubuntu-24.04
-            compiler: gcc-12
+          - name: osx15-arm-clang-clang-repl-20-emscripten
+            os: macos-15
+            compiler: clang
             clang-runtime: '20'
             cling: Off
             llvm_enable_projects: "clang;lld"
-            llvm_targets_to_build: "WebAssembly"
+            llvm_targets_to_build: "WebAssembly"            
             emsdk_ver: "3.1.73"
-          - name: osx15-arm-clang-clang-repl-20-emscripten
-            os: macos-15
-            compiler: clang
+          - name: ubu24-x86-gcc12-clang-repl-20-emscripten
+            os: ubuntu-24.04
+            compiler: gcc-12
             clang-runtime: '20'
             cling: Off
             llvm_enable_projects: "clang;lld"
@@ -466,16 +466,16 @@ jobs:
             cling: Off
             micromamba_shell_init: bash
             emsdk_ver: "3.1.73"
-          - name: ubu24-arm-gcc12-clang-repl-20-emscripten_wasm
-            os: ubuntu-24.04-arm
-            compiler: gcc-12
+          - name: osx15-arm-clang-clang-repl-20-emscripten_wasm
+            os: macos-15
+            compiler: clang
             clang-runtime: '20'
             cling: Off
             micromamba_shell_init: bash
             emsdk_ver: "3.1.73"
-          - name: osx15-arm-clang-clang-repl-20-emscripten_wasm
-            os: macos-15
-            compiler: clang
+          - name: ubu24-arm-gcc12-clang-repl-20-emscripten_wasm
+            os: ubuntu-24.04-arm
+            compiler: gcc-12
             clang-runtime: '20'
             cling: Off
             micromamba_shell_init: bash

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
 ```
 

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

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