Merge pull request #116 from IsabelParedes/emsdk

Use emsdk from escripten-forge
jupyter-xeus · Jan 15, 2025 · 8cf478b · 8cf478b
2 parents 2345a95 + d15f025
commit 8cf478b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -132,16 +132,9 @@ jobs:
           environment-file: environment-wasm-build.yml
           environment-name: xeus-r-wasm-build
 
-      - name: Setup emsdk
-        shell: bash -l {0}
-        run: |
-          emsdk install ${{matrix.emsdk_ver}}
-
       - name: Build xeus-r
         shell: bash -l {0}
         run: |
-          emsdk activate ${{matrix.emsdk_ver}}
-          source $CONDA_EMSDK_DIR/emsdk_env.sh
           micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
 
           mkdir build

diff --git a/environment-wasm-build.yml b/environment-wasm-build.yml
@@ -1,7 +1,7 @@
 name: xeus-r-wasm-build
 channels:
+  - https://repo.mamba.pm/emscripten-forge
   - conda-forge
 dependencies:
   - cmake
-  - emsdk >=3.1.11
-  - empack >=2.0.1
+  - emscripten_emscripten-wasm32==3.1.45
diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml
@@ -4,6 +4,7 @@ channels:
   - https://repo.mamba.pm/conda-forge
 dependencies:
   # Host dependencies
+  - emscripten-abi==3.1.45
   - nlohmann_json
   - xeus-lite
   - xeus