Skip to content

Commit a22275a

Browse files
authored
Update Emscripten CI (#416)
1 parent d1a9fa4 commit a22275a

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

.github/workflows/main.yml

+9-6
Original file line numberDiff line numberDiff line change
@@ -151,28 +151,31 @@ jobs:
151151
create-args: libuuid
152152

153153
- name: Setup emsdk
154-
run: emsdk install ${{ matrix.emsdk_ver }}
154+
shell: bash -l {0}
155+
run: |
156+
cd $HOME
157+
git clone https://github.com/emscripten-core/emsdk.git
158+
cd emsdk
159+
./emsdk install ${{ matrix.emsdk_ver }}
155160
156161
- name: Build and package xeus
157162
run: |
158-
emsdk activate ${{ matrix.emsdk_ver }}
159-
source $CONDA_EMSDK_DIR/emsdk_env.sh
163+
$HOME/emsdk/emsdk activate ${{matrix.emsdk_ver}}
164+
source $HOME/emsdk/emsdk_env.sh
160165
161166
micromamba create -f environment-wasm-host.yml --platform=emscripten-wasm32
162167
163168
mkdir build
164169
pushd build
165170
166-
export EMPACK_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-wasm-build
167171
export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-wasm-host
168172
export CMAKE_PREFIX_PATH=$PREFIX
169173
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
170174
171175
emcmake cmake \
172176
-DCMAKE_BUILD_TYPE=Release \
173-
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
177+
-DCMAKE_FIND_ROOT_PATH=$PREFIX \
174178
-DXEUS_EMSCRIPTEN_WASM_BUILD=ON \
175-
-Dnlohmann_json_DIR=$MAMBA_ROOT_PREFIX/share/cmake/nlohmann_json \
176179
..
177180
178181
make -j${{ steps.cpu-cores.outputs.count }}

environment-wasm-build.yml

-2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,4 @@ channels:
33
- conda-forge
44
dependencies:
55
- cmake
6-
- emsdk >=3.1.11
7-
- empack >=2.0.1
86

0 commit comments

Comments
 (0)