@@ -93,10 +93,11 @@ jobs:
93
93
if : ${{ runner.os != 'windows' }}
94
94
shell : bash -l {0}
95
95
run : |
96
+ set -e
96
97
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
97
98
source ./emsdk/emsdk_env.sh
98
99
micromamba create -f environment-wasm.yml --platform=emscripten-wasm32
99
-
100
+ export SYSROOT_PATH=$PWD/emsdk/upstream/emscripten/cache/sysroot
100
101
export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
101
102
export CMAKE_PREFIX_PATH=$PREFIX
102
103
export CMAKE_SYSTEM_PREFIX_PATH=$PREFIX
@@ -130,6 +131,7 @@ jobs:
130
131
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
131
132
-DCMAKE_INSTALL_PREFIX=$PREFIX \
132
133
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
134
+ -DSYSROOT_PATH=$SYSROOT_PATH \
133
135
../
134
136
else
135
137
emcmake cmake -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} \
@@ -141,13 +143,15 @@ jobs:
141
143
-DCODE_COVERAGE=${{ env.CODE_COVERAGE }} \
142
144
-DCMAKE_INSTALL_PREFIX=$PREFIX \
143
145
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
146
+ -DSYSROOT_PATH=$SYSROOT_PATH \
144
147
../
145
148
fi
146
-
149
+ emmake make -j ${{ env.ncpus }} check-cppinterop
147
150
emmake make -j ${{ env.ncpus }} install
148
151
149
152
cd ..
150
-
153
+
154
+ echo "SYSROOT_PATH=$SYSROOT_PATH" >> $GITHUB_ENV
151
155
echo "CB_PYTHON_DIR=$CB_PYTHON_DIR" >> $GITHUB_ENV
152
156
echo "CPPINTEROP_BUILD_DIR=$CPPINTEROP_BUILD_DIR" >> $GITHUB_ENV
153
157
echo "CPPINTEROP_DIR=$CPPINTEROP_DIR" >> $GITHUB_ENV
@@ -160,7 +164,6 @@ jobs:
160
164
run : |
161
165
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
162
166
source ./emsdk/emsdk_env.sh
163
- export SYSROOT_PATH=$PWD/emsdk/upstream/emscripten/cache/sysroot
164
167
micromamba activate CppInterOp-wasm
165
168
git clone --depth=1 https://github.com/compiler-research/xeus-cpp.git
166
169
cd ./xeus-cpp
@@ -175,7 +178,7 @@ jobs:
175
178
-DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \
176
179
-DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=ON \
177
180
-DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \
178
- -DSYSROOT_PATH=$SYSROOT_PATH \
181
+ -DSYSROOT_PATH=${{ env. SYSROOT_PATH }} \
179
182
..
180
183
emmake make -j ${{ env.ncpus }} install
181
184
0 commit comments