@@ -93,10 +93,11 @@ jobs:
9393 if : ${{ runner.os != 'windows' }}
9494 shell : bash -l {0}
9595 run : |
96+ set -e
9697 ./emsdk/emsdk activate ${{matrix.emsdk_ver}}
9798 source ./emsdk/emsdk_env.sh
9899 micromamba create -f environment-wasm.yml --platform=emscripten-wasm32
99-
100+ export SYSROOT_PATH=$PWD/emsdk/upstream/emscripten/cache/sysroot
100101 export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
101102 export CMAKE_PREFIX_PATH=$PREFIX
102103 export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
@@ -130,6 +131,7 @@ jobs:
130131 -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
131132 -DCMAKE_INSTALL_PREFIX=$PREFIX \
132133 -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
134+ -DSYSROOT_PATH=$SYSROOT_PATH \
133135 ../
134136 else
135137 emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
@@ -141,13 +143,15 @@ jobs:
141143 -DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
142144 -DCMAKE_INSTALL_PREFIX=$PREFIX \
143145 -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
146+ -DSYSROOT_PATH=$SYSROOT_PATH \
144147 ../
145148 fi
146-
149+ emmake make -j ${{ env.ncpus }} check-cppinterop
147150 emmake make -j ${{ env.ncpus }} install
148151
149152 cd ..
150-
153+
154+ echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV
151155 echo "CB_PYTHON_DIR=$CB_PYTHON_DIR" >> $GITHUB_ENV
152156 echo "CPPINTEROP_BUILD_DIR=$CPPINTEROP_BUILD_DIR" >> $GITHUB_ENV
153157 echo "CPPINTEROP_DIR=$CPPINTEROP_DIR" >> $GITHUB_ENV
@@ -160,7 +164,6 @@ jobs:
160164 run : |
161165 ./emsdk/emsdk activate ${{matrix.emsdk_ver}}
162166 source ./emsdk/emsdk_env.sh
163- export SYSROOT_PATH=$PWD/emsdk/upstream/emscripten/cache/sysroot
164167 micromamba activate CppInterOp-wasm
165168 git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
166169 cd ./xeus-cpp
@@ -175,7 +178,7 @@ jobs:
175178 -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
176179 -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
177180 -DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \
178- -DSYSROOT_PATH=$SYSROOT_PATH \
181+ -DSYSROOT_PATH=${{ env. SYSROOT_PATH }} \
179182 ..
180183 emmake make -j ${{ env.ncpus }} install
181184
0 commit comments