Skip to content

Dont use conda emsdk #361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 2, 2024
Merged

Dont use conda emsdk #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3305792
Update ci.yml to not use emsdk from conda
mcbarton Dec 2, 2024
1950592
Update environment-wasm-build.yml to remove emsdk and empack
mcbarton Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,18 +1147,21 @@ jobs:
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.45"
- name: osx14-arm-clang-clang-repl-19-emscripten_wasm
os: macos-14
compiler: clang
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.45"
- name: osx13-x86-clang-clang-repl-19-emscripten_wasm
os: macos-13
compiler: clang
clang-runtime: '19'
cling: Off
micromamba_shell_init: bash
emsdk_ver: "3.1.45"

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -1214,7 +1217,9 @@ jobs:
- name: Setup emsdk
shell: bash -l {0}
run: |
emsdk install 3.1.45
git clone https://github.com/emscripten-core/emsdk.git
cd emsdk
./emsdk install ${{ matrix.emsdk_ver }}

- name: Restore Cache LLVM/Clang runtime build directory
uses: actions/cache/restore@v4
Expand All @@ -1229,11 +1234,10 @@ jobs:
if: ${{ runner.os != 'windows' }}
shell: bash -l {0}
run: |
emsdk activate 3.1.45
source $CONDA_EMSDK_DIR/emsdk_env.sh
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
source ./emsdk/emsdk_env.sh
micromamba create -f environment-wasm.yml --platform=emscripten-wasm32

export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm-build
export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
export CMAKE_PREFIX_PATH=$PREFIX
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
Expand Down Expand Up @@ -1299,14 +1303,13 @@ jobs:
- name: Build xeus-cpp
shell: bash -l {0}
run: |
emsdk activate 3.1.45
source $CONDA_EMSDK_DIR/emsdk_env.sh
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
source ./emsdk/emsdk_env.sh
micromamba activate CppInterOp-wasm
git clone https://github.com/compiler-research/xeus-cpp.git
cd ./xeus-cpp
mkdir build
pushd build
export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm-build
export CMAKE_PREFIX_PATH=${{ env.PREFIX }}
export CMAKE_SYSTEM_PREFIX_PATH=${{ env.PREFIX }}
emcmake cmake \
Expand Down
2 changes: 0 additions & 2 deletions environment-wasm-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,3 @@ channels:
- conda-forge
dependencies:
- cmake
- emsdk >=3.1.11
- empack >=2.0.1