diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index d79b2adb..a350e1c5 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -46,7 +46,7 @@ jobs: set -e micromamba create -f environment-wasm-host.yml \ --platform=emscripten-wasm32 \ - -c https://prefix.dev/emscripten-forge-4x \ + -c https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x \ -c https://prefix.dev/conda-forge mkdir build diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 809a3954..b27b06a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -244,7 +244,7 @@ jobs: set -e micromamba create -f environment-wasm-host.yml \ --platform=emscripten-wasm32 \ - -c https://prefix.dev/emscripten-forge-4x \ + -c https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x \ -c https://prefix.dev/conda-forge mkdir build diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6b3fb9d7..eb7e00e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in ```bash micromamba create -f environment-wasm-host.yml \ --platform=emscripten-wasm32 \ --c https://prefix.dev/emscripten-forge-4x \ +-c https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x \ -c https://prefix.dev/conda-forge mkdir build diff --git a/README.md b/README.md index 175bdcef..7739c8b3 100644 --- a/README.md +++ b/README.md @@ -91,7 +91,7 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in ```bash micromamba create -f environment-wasm-host.yml \ --platform=emscripten-wasm32 \ --c https://prefix.dev/emscripten-forge-4x \ +-c https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x \ -c https://prefix.dev/conda-forge mkdir build diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index 13dd7d94..fd8f951d 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -72,7 +72,7 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in micromamba create -f environment-wasm-host.yml \ --platform=emscripten-wasm32 \ - -c https://prefix.dev/emscripten-forge-4x \ + -c https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x \ -c https://prefix.dev/conda-forge mkdir build diff --git a/docs/source/conf.py b/docs/source/conf.py index 462202b1..c20200e6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -21,7 +21,7 @@ micromamba activate xeus-cpp-wasm-build; micromamba create -f environment-wasm-host.yml \ --platform=emscripten-wasm32 \ --c https://prefix.dev/emscripten-forge-4x \ +-c https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x \ -c https://prefix.dev/conda-forge mkdir -p build; cd build; diff --git a/environment-wasm-build.yml b/environment-wasm-build.yml index be953293..51a73be4 100644 --- a/environment-wasm-build.yml +++ b/environment-wasm-build.yml @@ -1,7 +1,7 @@ name: xeus-cpp-wasm-build channels: - - https://prefix.dev/emscripten-forge-4x + - https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x - https://prefix.dev/conda-forge dependencies: - cmake - - emscripten_emscripten-wasm32==4.0.9 \ No newline at end of file + - emscripten_emscripten-wasm32==6.0.8 diff --git a/environment-wasm-host.yml b/environment-wasm-host.yml index 19dff644..14d7cfe3 100644 --- a/environment-wasm-host.yml +++ b/environment-wasm-host.yml @@ -1,13 +1,13 @@ name: xeus-cpp-wasm-host channels: - - https://prefix.dev/emscripten-forge-4x + - https://prefix.dev/emscripten-forge-bot/emscripten-forge-6x - https://prefix.dev/conda-forge dependencies: - nlohmann_json - nlohmann_json-abi - - xeus-lite + - xeus-lite-static - xeus - cppinterop>=1.9 - cpp-argparse - - pugixml + - pugixml-static - doctest diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 66cb05aa..7ccf116e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -65,7 +65,6 @@ if(EMSCRIPTEN) target_link_options(test_xeus_cpp PUBLIC "SHELL: ${XEUS_CPP_WASM_KERNEL_EXTRA_FLAGS}" PUBLIC "SHELL: -s MAIN_MODULE=1" - PUBLIC "SHELL: -s WASM_BIGINT" PUBLIC "SHELL: -s ASSERTIONS=0" PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1" PUBLIC "SHELL: -s STACK_SIZE=32mb"