Skip to content

Commit 0dc7d72

Browse files
authored
Fix xeus-cpp-lite deployment (#420)
1 parent 1bc6be2 commit 0dc7d72

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

.github/workflows/deploy-pages.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
shell: bash -l {0}
9393
run: |
9494
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
95-
source ./emsdk/emsdk_env.sh
95+
source ./emsdk/emsdk_env.sh
9696
micromamba create -f environment-wasm.yml --platform=emscripten-wasm32
9797
9898
export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
@@ -142,7 +142,7 @@ jobs:
142142
../
143143
fi
144144
145-
emmake make -j ${{ env.ncpus }}
145+
emmake make -j ${{ env.ncpus }} install
146146
147147
cd ..
148148
@@ -181,12 +181,12 @@ jobs:
181181
shell: bash -l {0}
182182
run: |
183183
cd ./xeus-cpp/
184-
micromamba create -n xeus-lite-host jupyterlite-core
184+
micromamba create -n xeus-lite-host jupyterlite-core -c conda-forge
185185
micromamba activate xeus-lite-host
186186
python -m pip install jupyterlite-xeus
187187
jupyter lite build --XeusAddon.prefix=${{ env.PREFIX }} --output-dir dist
188188
cp ${{ env.PREFIX }}/bin/xcpp.data dist/extensions/@jupyterlite/xeus/static
189-
cp ${{ env.CPPINTEROP_BUILD_DIR }}/lib/libclangCppInterOp.so dist/extensions/@jupyterlite/xeus/static
189+
cp ${{ env.PREFIX }}/lib/libclangCppInterOp.so dist/extensions/@jupyterlite/xeus/static
190190
191191
- name: Upload artifact
192192
uses: actions/upload-pages-artifact@v3

.github/workflows/emscripten.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ jobs:
541541
shell: bash -l {0}
542542
run: |
543543
./emsdk/emsdk activate ${{matrix.emsdk_ver}}
544-
source ./emsdk/emsdk_env.sh
544+
source ./emsdk/emsdk_env.sh
545545
micromamba create -f environment-wasm.yml --platform=emscripten-wasm32
546546
547547
export PREFIX=$MAMBA_ROOT_PREFIX/envs/CppInterOp-wasm
@@ -590,7 +590,7 @@ jobs:
590590
../
591591
fi
592592
593-
emmake make -j ${{ env.ncpus }}
593+
emmake make -j ${{ env.ncpus }} install
594594
595595
cd ..
596596
@@ -623,4 +623,4 @@ jobs:
623623
-DCppInterOp_DIR="${{ env.CPPINTEROP_BUILD_DIR }}/lib/cmake/CppInterOp" \
624624
-DSYSROOT_PATH=$SYSROOT_PATH \
625625
..
626-
emmake make -j ${{ env.ncpus }}
626+
emmake make -j ${{ env.ncpus }} install

lib/Interpreter/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ if(EMSCRIPTEN)
1717
LINK_LIBS
1818
clangInterpreter
1919
)
20+
target_link_options(clangCppInterOp PRIVATE
21+
PUBLIC "SHELL: -s WASM_BIGINT"
22+
)
2023
else()
2124
set(LLVM_LINK_COMPONENTS
2225
${LLVM_TARGETS_TO_BUILD}

0 commit comments

Comments
 (0)