Skip to content

Commit

Permalink
Merge branch 'main' into extract_filename
Browse files Browse the repository at this point in the history
  • Loading branch information
anutosh491 authored Dec 17, 2024
2 parents 0de46b4 + c216de1 commit 318239a
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
7 changes: 3 additions & 4 deletions cmake/WasmBuildOptions.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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()
endfunction()
1 change: 1 addition & 0 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ channels:
dependencies:
- breathe
- sphinx_rtd_theme
- sphinx=6.*

0 comments on commit 318239a

Please sign in to comment.