diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 45869b31..1b60036d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -37,7 +37,7 @@ jobs: - name: Get number of CPU cores uses: SimenB/github-actions-cpu-cores@v2 - - name: Install mamba + - name: Install micromamba uses: mamba-org/setup-micromamba@v2 with: environment-file: environment-dev.yml @@ -90,7 +90,7 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Install mamba + - name: Install micromamba uses: mamba-org/setup-micromamba@v2 with: environment-file: environment-dev.yml diff --git a/cmake/WasmBuildOptions.cmake b/cmake/WasmBuildOptions.cmake index 08e7e3c0..2878a3a3 100644 --- a/cmake/WasmBuildOptions.cmake +++ b/cmake/WasmBuildOptions.cmake @@ -13,7 +13,6 @@ function(xeus_wasm_compile_options target) target_compile_options("${target}" PUBLIC --std=c++17 PUBLIC -Wno-deprecated - PUBLIC "SHELL: -s USE_PTHREADS=0" PUBLIC "SHELL: -fexceptions" ) set_property(TARGET ${target} PROPERTY POSITION_INDEPENDENT_CODE ON) @@ -33,12 +32,12 @@ function(xeus_wasm_link_options target environment) PUBLIC "SHELL: -s ALLOW_MEMORY_GROWTH=1" PUBLIC "SHELL: -s EXIT_RUNTIME=1" PUBLIC "SHELL: -s WASM=1" - PUBLIC "SHELL: -s USE_PTHREADS=0" PUBLIC "SHELL: -s ENVIRONMENT=${environment}" - PUBLIC "SHELL: -s TOTAL_STACK=32mb" + PUBLIC "SHELL: -s STACK_SIZE=32mb" PUBLIC "SHELL: -s INITIAL_MEMORY=128mb" PUBLIC "SHELL: -s WASM_BIGINT" + PUBLIC "SHELL: -s EXPORTED_RUNTIME_METHODS='[\"FS\",\"PATH\",\"LDSO\",\"getDylinkMetadata\",\"loadDynamicLibrary\",\"ERRNO_CODES\"]'" PUBLIC "SHELL: -s FORCE_FILESYSTEM" PUBLIC "SHELL: -s MAIN_MODULE=1" ) -endfunction() \ No newline at end of file +endfunction() diff --git a/docs/environment.yml b/docs/environment.yml index b6b219d9..dbb1da0f 100644 --- a/docs/environment.yml +++ b/docs/environment.yml @@ -6,3 +6,4 @@ channels: dependencies: - breathe - sphinx_rtd_theme + - sphinx=6.*