Split up setting up Jupyter Lite wesbite, and running kernels in it

Author: mcbarton

.github/actions/Emscripten-Notebook-Tests/action.yml

@@ -18,34 +18,10 @@ runs:
       shell: bash -l {0}
       run: |
         set -e
-        micromamba create -n xeus-lite-host jupyterlite-core=0.6 jupyterlite-xeus -c conda-forge -y
         micromamba activate xeus-lite-host
-        if [[ "${{ matrix.os }}" == "macos"* ]]; then
-          brew install coreutils
-          export PATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH"
-        fi
-        export INPUT_TEXT="" 
         if [[ "${{ inputs.notebook }}" == "xeus-cpp-lite-demo.ipynb"* ]]; then
           export INPUT_TEXT="--stdin Test_Name"
         fi 
-        timeout 300 jupyter lite serve --settings-overrides=overrides.json --XeusAddon.prefix=${{ env.PREFIX }} \
-                       --XeusAddon.mounts="${{ env.PREFIX }}/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" \
-                       --XeusAddon.mounts="${{ env.PREFIX }}/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \
-                       --contents README.md \
-                       --contents notebooks/xeus-cpp-lite-demo.ipynb \
-                       --contents notebooks/images/marie.png \
-                       --contents notebooks/audio/audio.wav \
-                       --output-dir dist &
-        export jupyter_lite_process_id=$!
-        # There is a bug in nbdime after 3.2.0 where it will show the filenames as if there was a diff
-        # but there is no diff with the options chosen below (the latest doesn't show a diff, just the filenames with +++
-        # and --- as if it was planning to show a diff. This only happens for xeus-cpp-lite-demo.ipynb.
-        python -m pip install nbdime==3.2.0
-        python -m pip install selenium
-        # This sleep is to force enough time for the jupyter site to build before trying
-        # to run notebooks in it. If you try to run the notebooks before the website is
-        # ready the ci python script will crash saying ti cannot access the url
-        sleep 10
         echo "Running xeus-cpp in Jupter Lite in Chrome"
         python -u scripts/automated-notebook-run-script.py --driver chrome --notebook ${{ inputs.notebook }} --kernel ${{ inputs.kernel }} $INPUT_TEXT
         nbdiff notebooks/${{ inputs.notebook }} $HOME/Downloads/${{ inputs.notebook }} --ignore-id --ignore-metadata >> chrome_diff.txt
@@ -78,8 +54,3 @@ runs:
           cat chrome_diff.txt
           exit 1
         fi
-        # Kill the jupyter lite serve process now we are done running xeus-cpp in the
-        # Jupyter Lite website.
-        pkill -9 timeout
-        pkill -9 jupyter-lite
-        rm -rf ./dist .jupyterlite.doit.db

.github/actions/Jupyter-serve/action.yml

@@ -0,0 +1,34 @@
+name: 'This sets up our Jupyter Lite website, so we can run xeus-cpp in it'
+description: 'This action sets up our Jupyter Lite website, so we can run xeus-cpp in it'
+
+runs:
+  using: composite
+  steps:
+    - name: Jupyter Lite integration test
+      shell: bash -l {0}
+      run: |
+        set -e
+        micromamba create -n xeus-lite-host jupyterlite-core=0.6 jupyterlite-xeus -c conda-forge -y
+        micromamba activate xeus-lite-host
+        if [[ "${{ matrix.os }}" == "macos"* ]]; then
+          brew install coreutils
+          export PATH="$HOMEBREW_PREFIX/opt/coreutils/libexec/gnubin:$PATH"
+        fi
+        export INPUT_TEXT="" 
+        timeout 1080 jupyter lite serve --settings-overrides=overrides.json --XeusAddon.prefix=${{ env.PREFIX }} \
+                       --XeusAddon.mounts="${{ env.PREFIX }}/share/xeus-cpp/tagfiles:/share/xeus-cpp/tagfiles" \
+                       --XeusAddon.mounts="${{ env.PREFIX }}/etc/xeus-cpp/tags.d:/etc/xeus-cpp/tags.d" \
+                       --contents README.md \
+                       --contents notebooks/xeus-cpp-lite-demo.ipynb \
+                       --contents notebooks/images/marie.png \
+                       --contents notebooks/audio/audio.wav \
+                       --output-dir dist &
+        # There is a bug in nbdime after 3.2.0 where it will show the filenames as if there was a diff
+        # but there is no diff with the options chosen below (the latest doesn't show a diff, just the filenames with +++
+        # and --- as if it was planning to show a diff. This only happens for xeus-cpp-lite-demo.ipynb.
+        python -m pip install nbdime==3.2.0
+        python -m pip install selenium
+        # This sleep is to force enough time for the jupyter site to build before trying
+        # to run notebooks in it. If you try to run the notebooks before the website is
+        # ready the ci python script will crash saying ti cannot access the url
+        sleep 10

.github/workflows/main.yml

@@ -329,6 +329,9 @@ jobs:
           fi
         timeout-minutes: 4
 
+      - name: Serve Jupyter Lite website
+        uses: ./.github/actions/Jupyter-serve
+
       - name: Test C++17 kernel in xeus-cpp-lite-demo.ipynb
         uses: ./.github/actions/Emscripten-Notebook-Tests
         with: