From a901f57e340683a0ca83f6cd94994cb2d222fa09 Mon Sep 17 00:00:00 2001
From: mcbarton <matthew.c.barton@hotmail.co.uk>
Date: Sun, 2 Feb 2025 12:48:57 +0000
Subject: [PATCH] Upgrade to emsdk to version 3.1.73 (#456)

---
 .github/workflows/deploy-pages.yml     |  2 +-
 .github/workflows/emscripten.yml       | 38 +++++++++++++-------------
 Emscripten-build-instructions.md       |  6 ++--
 docs/Emscripten-build-instructions.rst |  6 ++--
 environment-wasm.yml                   |  3 +-
 5 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml
index 93b1b39cf..da9c2dc25 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 bf63e44d8..10563d300 100644
--- a/.github/workflows/emscripten.yml
+++ b/.github/workflows/emscripten.yml
@@ -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
@@ -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
diff --git a/Emscripten-build-instructions.md b/Emscripten-build-instructions.md
index 832c64bf0..662643db3 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 c3f396937..aa0254c3f 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
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