diff --git a/.github/workflows/deploy-github-page.yml b/.github/workflows/deploy-github-page.yml index 94c0894b..fc6c728e 100644 --- a/.github/workflows/deploy-github-page.yml +++ b/.github/workflows/deploy-github-page.yml @@ -56,19 +56,19 @@ jobs: echo "PREFIX=$PREFIX" >> $GITHUB_ENV export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot + micromamba create -n node-env -c conda-forge nodejs=22 + export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ - -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ .. - micromamba create -n node-env -c conda-forge nodejs=22 - export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - - make check-xeus-cpp + emmake make check-xeus-cpp -j ${{ env.ncpus }} emmake make -j ${{ env.ncpus }} install - name: Test Emscripten xeus-cpp in browser @@ -123,7 +123,7 @@ jobs: cd ./chrome/opt/google/chrome/ export PATH="$PWD:$PATH" cd - - + # Install Firefox wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz tar -xJf firefox-138.0.1.tar.xz diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a4a1689..ee5801fe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -228,19 +228,19 @@ jobs: echo "PREFIX=$PREFIX" >> $GITHUB_ENV export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot + micromamba create -n node-env -c conda-forge nodejs=22 + export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DXEUS_CPP_EMSCRIPTEN_WASM_BUILD=ON \ -DCMAKE_FIND_ROOT_PATH=$PREFIX \ -DSYSROOT_PATH=$SYSROOT_PATH \ - -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ + -DCMAKE_COMPILE_WARNING_AS_ERROR=ON \ .. - micromamba create -n node-env -c conda-forge nodejs=22 - export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - - make check-xeus-cpp + emmake make check-xeus-cpp -j ${{ env.ncpus }} emmake make -j ${{ env.ncpus }} install - name: Test Emscripten xeus-cpp in browser @@ -300,7 +300,7 @@ jobs: cd ./chrome/opt/google/chrome/ export PATH="$PWD:$PATH" cd - - + # Install Firefox wget https://ftp.mozilla.org/pub/firefox/releases/138.0.1/linux-x86_64/en-GB/firefox-138.0.1.tar.xz tar -xJf firefox-138.0.1.tar.xz diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7c6d42b7..f68b64b6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -84,6 +84,9 @@ export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot +micromamba create -n node-env -c conda-forge nodejs=22 +export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ @@ -92,10 +95,7 @@ emcmake cmake \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. -micromamba create -n node-env -c conda-forge nodejs=22 -export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - -make check-xeus-cpp +emmake make check-xeus-cpp emmake make install ``` diff --git a/README.md b/README.md index 0615ae40..bff97d94 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,9 @@ export BUILD_PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-build export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot +micromamba create -n node-env -c conda-forge nodejs=22 +export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ @@ -107,10 +110,7 @@ emcmake cmake \ -DSYSROOT_PATH=$SYSROOT_PATH \ .. -micromamba create -n node-env -c conda-forge nodejs=22 -export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - -make check-xeus-cpp +emmake make check-xeus-cpp emmake make install ``` diff --git a/docs/source/InstallationAndUsage.rst b/docs/source/InstallationAndUsage.rst index af8fa635..873a2eba 100644 --- a/docs/source/InstallationAndUsage.rst +++ b/docs/source/InstallationAndUsage.rst @@ -79,6 +79,9 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in export PREFIX=$MAMBA_ROOT_PREFIX/envs/xeus-cpp-wasm-host export SYSROOT_PATH=$BUILD_PREFIX/opt/emsdk/upstream/emscripten/cache/sysroot + micromamba create -n node-env -c conda-forge nodejs=22 + export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" + emcmake cmake \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ @@ -87,10 +90,7 @@ You are now in a position to build the xeus-cpp kernel. You build and test it in -DSYSROOT_PATH=$SYSROOT_PATH \ .. - micromamba create -n node-env -c conda-forge nodejs=22 - export PATH="$MAMBA_ROOT_PREFIX/envs/node-env/bin:$PATH" - - make check-xeus-cpp + emmake make check-xeus-cpp emmake make install It is possible to run the Emscripten tests in a headless browser. We will run our tests in a fresh installed browser. Installing the browsers, and running the tests within the installed browsers will be platform dependent. To do this for Chrome and Firefox on MacOS execute the following