Skip to content

Commit

Permalink
Update xeus to use emsdk 3.1.73 (#417)
Browse files Browse the repository at this point in the history
  • Loading branch information
anutosh491 authored Jan 30, 2025
1 parent a22275a commit a752d14
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 16 deletions.
15 changes: 1 addition & 14 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,10 @@ jobs:

emscripten_wasm:

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

strategy:
fail-fast: false
matrix:
emsdk_ver: ["3.1.2", "3.1.45"]

steps:
- uses: actions/checkout@v4
Expand All @@ -150,19 +148,8 @@ jobs:
environment-name: xeus-wasm-build
create-args: libuuid

- name: Setup emsdk
shell: bash -l {0}
run: |
cd $HOME
git clone https://github.com/emscripten-core/emsdk.git
cd emsdk
./emsdk install ${{ matrix.emsdk_ver }}
- name: Build and package xeus
run: |
$HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
source $HOME/emsdk/emsdk_env.sh
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
mkdir build
Expand Down
1 change: 0 additions & 1 deletion cmake/WasmBuildOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ function(xeus_wasm_link_options target environment)
PUBLIC "SHELL: -s EXPORT_NAME=\"createXeusModule\""
PUBLIC "SHELL: -s EXPORT_ES6=0"
PUBLIC "SHELL: -s USE_ES6_IMPORT_META=0"
PUBLIC "SHELL: -s DEMANGLE_SUPPORT=0"
PUBLIC "SHELL: -s ASSERTIONS=0"
PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1"
PUBLIC "SHELL: -s EXIT_RUNTIME=1"
Expand Down
2 changes: 2 additions & 0 deletions environment-wasm-build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: xeus-wasm-build
channels:
- https://repo.prefix.dev/emscripten-forge-dev
- conda-forge
dependencies:
- cmake
- emscripten_emscripten-wasm32==3.1.73

2 changes: 1 addition & 1 deletion environment-wasm-host.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: xeus-wasm-host
channels:
- https://repo.mamba.pm/emscripten-forge
- https://repo.prefix.dev/emscripten-forge-dev
- https://repo.mamba.pm/conda-forge
dependencies:
- nlohmann_json
Expand Down

0 comments on commit a752d14

Please sign in to comment.