@@ -1147,18 +1147,21 @@ jobs:
11471147 clang-runtime : ' 19'
11481148 cling : Off
11491149 micromamba_shell_init : bash
1150+ emsdk_ver : " 3.1.45"
11501151 - name : osx14-arm-clang-clang-repl-19-emscripten_wasm
11511152 os : macos-14
11521153 compiler : clang
11531154 clang-runtime : ' 19'
11541155 cling : Off
11551156 micromamba_shell_init : bash
1157+ emsdk_ver : " 3.1.45"
11561158 - name : osx13-x86-clang-clang-repl-19-emscripten_wasm
11571159 os : macos-13
11581160 compiler : clang
11591161 clang-runtime : ' 19'
11601162 cling : Off
11611163 micromamba_shell_init : bash
1164+ emsdk_ver : " 3.1.45"
11621165
11631166 steps :
11641167 - uses : actions/checkout@v4
@@ -1214,7 +1217,9 @@ jobs:
12141217 - name : Setup emsdk
12151218 shell : bash -l {0}
12161219 run : |
1217- emsdk install 3.1.45
1220+ git clone https://github.com/emscripten-core/emsdk.git
1221+ cd emsdk
1222+ ./emsdk install ${{ matrix.emsdk_ver }}
12181223
12191224 - name : Restore Cache LLVM/Clang runtime build directory
12201225 uses : actions/cache/restore@v4
@@ -1229,11 +1234,10 @@ jobs:
12291234 if : ${{ runner.os != 'windows' }}
12301235 shell : bash -l {0}
12311236 run : |
1232- emsdk activate 3.1.45
1233- source $CONDA_EMSDK_DIR /emsdk_env.sh
1237+ ./ emsdk/emsdk activate ${{matrix.emsdk_ver}}
1238+ source ./emsdk /emsdk_env.sh
12341239 micromamba create -f environment-wasm.yml --platform=emscripten-wasm32
12351240
1236- export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm-build
12371241 export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
12381242 export CMAKE_PREFIX_PATH=$PREFIX
12391243 export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
@@ -1299,14 +1303,13 @@ jobs:
12991303 - name : Build xeus-cpp
13001304 shell : bash -l {0}
13011305 run : |
1302- emsdk activate 3.1.45
1303- source $CONDA_EMSDK_DIR /emsdk_env.sh
1306+ ./ emsdk/emsdk activate ${{matrix.emsdk_ver}}
1307+ source ./emsdk /emsdk_env.sh
13041308 micromamba activate CppInterOp-wasm
13051309 git clone https://github.com/compiler-research/xeus-cpp.git
13061310 cd ./xeus-cpp
13071311 mkdir build
13081312 pushd build
1309- export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm-build
13101313 export CMAKE_PREFIX_PATH=${{ env.PREFIX }}
13111314 export CMAKE_SYSTEM_PREFIX_PATH=${{ env.PREFIX }}
13121315 emcmake cmake \
0 commit comments