@@ -1152,18 +1152,21 @@ jobs:
11521152 clang-runtime : ' 19'
11531153 cling : Off
11541154 micromamba_shell_init : bash
1155+ emsdk_ver : " 3.1.45"
11551156 - name : osx15-arm-clang-clang-repl-19-emscripten_wasm
11561157 os : macos-15
11571158 compiler : clang
11581159 clang-runtime : ' 19'
11591160 cling : Off
11601161 micromamba_shell_init : bash
1162+ emsdk_ver : " 3.1.45"
11611163 - name : osx13-x86-clang-clang-repl-19-emscripten_wasm
11621164 os : macos-13
11631165 compiler : clang
11641166 clang-runtime : ' 19'
11651167 cling : Off
11661168 micromamba_shell_init : bash
1169+ emsdk_ver : " 3.1.45"
11671170
11681171 steps :
11691172 - uses : actions/checkout@v4
@@ -1219,7 +1222,9 @@ jobs:
12191222 - name : Setup emsdk
12201223 shell : bash -l {0}
12211224 run : |
1222- emsdk install 3.1.45
1225+ git clone https://github.com/emscripten-core/emsdk.git
1226+ cd emsdk
1227+ ./emsdk install ${{ matrix.emsdk_ver }}
12231228
12241229 - name : Restore Cache LLVM/Clang runtime build directory
12251230 uses : actions/cache/restore@v4
@@ -1234,11 +1239,10 @@ jobs:
12341239 if : ${{ runner.os != 'windows' }}
12351240 shell : bash -l {0}
12361241 run : |
1237- emsdk activate 3.1.45
1238- source $CONDA_EMSDK_DIR /emsdk_env.sh
1242+ ./ emsdk/emsdk activate ${{matrix.emsdk_ver}}
1243+ source ./emsdk /emsdk_env.sh
12391244 micromamba create -f environment-wasm.yml --platform=emscripten-wasm32
12401245
1241- export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm-build
12421246 export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
12431247 export CMAKE_PREFIX_PATH=$PREFIX
12441248 export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
@@ -1304,14 +1308,13 @@ jobs:
13041308 - name : Build xeus-cpp
13051309 shell : bash -l {0}
13061310 run : |
1307- emsdk activate 3.1.45
1308- source $CONDA_EMSDK_DIR /emsdk_env.sh
1311+ ./ emsdk/emsdk activate ${{matrix.emsdk_ver}}
1312+ source ./emsdk /emsdk_env.sh
13091313 micromamba activate CppInterOp-wasm
13101314 git clone https://github.com/compiler-research/xeus-cpp.git
13111315 cd ./xeus-cpp
13121316 mkdir build
13131317 pushd build
1314- export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm-build
13151318 export CMAKE_PREFIX_PATH=${{ env.PREFIX }}
13161319 export CMAKE_SYSTEM_PREFIX_PATH=${{ env.PREFIX }}
13171320 emcmake cmake \
0 commit comments