From 418daeb4f9067da16306b4842c05591a98b0eb62 Mon Sep 17 00:00:00 2001 From: Joe Wallwork Date: Mon, 10 Nov 2025 08:48:23 +0000 Subject: [PATCH 1/4] Fix paths to repos --- .github/workflows/build_docs.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index 81b7ebb..d2824b0 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -60,13 +60,13 @@ jobs: image: ghcr.io/mesh-adaptation/firedrake-um2n:latest options: --user root volumes: - - ${{ github.workspace }}:/home/firedrake/output + - ${{ github.workspace }}:/root/output if: ${{ needs.check_updates.outputs.updates_found == 'true' || github.event_name != 'schedule' }} steps: - name: Export PYTHONPATH run: | PYTHONVERSION=$(python3 -c "import sys; print('.'.join(sys.version.split('.')[:2]))") - echo "PYTHONPATH=/home/firedrake/firedrake:/home/firedrake/animate:/home/firedrake/goalie:/home/firedrake/movement:/home/firedrake/UM2N:/home/firedrake/.local/lib/python${PYTHONVERSION}/site-packages" >> $GITHUB_ENV + echo "PYTHONPATH=/opt/firedrake:/root/animate:/root/goalie:/root/movement:/root/um2n:/root/.local/lib/python${PYTHONVERSION}/site-packages" >> $GITHUB_ENV - uses: actions/checkout@v5 with: @@ -76,15 +76,15 @@ jobs: run: | git config --global --add safe.directory '*' for REPO in animate goalie movement UM2N; do - cd /home/firedrake/${REPO} + cd /root/${REPO} git pull done - working-directory: /home/firedrake/output/ + working-directory: /root/output/ shell: bash - name: Install Sphinx and other dependencies run: python3 -m pip install -r requirements.txt - working-directory: /home/firedrake/output/ + working-directory: /root/output/ shell: bash - name: Build HTML Documentation @@ -94,13 +94,13 @@ jobs: make run_goalie_demos make run_movement_demos make html - working-directory: /home/firedrake/output/ + working-directory: /root/output/ shell: bash - name: Upload Artifact uses: actions/upload-pages-artifact@v3 with: - path: /home/firedrake/output/docs/build/html + path: /root/output/docs/build/html deploy: runs-on: ubuntu-latest From 9599c0cd55d875900a6e22341d1e0977056c801e Mon Sep 17 00:00:00 2001 From: Joe Wallwork Date: Mon, 10 Nov 2025 08:57:40 +0000 Subject: [PATCH 2/4] Crash if error raised during testing --- .github/workflows/build_docs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml index d2824b0..8f2f232 100644 --- a/.github/workflows/build_docs.yml +++ b/.github/workflows/build_docs.yml @@ -89,6 +89,7 @@ jobs: - name: Build HTML Documentation run: | + set -e cd docs make run_animate_demos make run_goalie_demos From d6d35670beb5578d080b800813e08d5a8e43f663 Mon Sep 17 00:00:00 2001 From: Joe Wallwork Date: Mon, 17 Nov 2025 08:14:26 +0000 Subject: [PATCH 3/4] Attempt to make tests fail as expected --- docs/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/docs/Makefile b/docs/Makefile index 5794849..ccb3068 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -28,8 +28,7 @@ run_animate_demos: for FILE in *.py; do \ echo "Running Animate demo $$FILE"; \ ${PYTHON} $$FILE; \ - done; \ - cd . \ + done run_goalie_demos: SKIP_DEMOS="time_partition.py gray_scott.py gray_scott_split.py"; \ @@ -41,8 +40,7 @@ run_goalie_demos: else \ echo "Skipping Goalie demo $$FILE"; \ fi; \ - done; \ - cd . \ + done run_movement_demos: SKIP_DEMOS="monge_ampere_3d.py"; \ @@ -54,8 +52,7 @@ run_movement_demos: else \ echo "Skipping Movement demo $$FILE"; \ fi; \ - done; \ - cd . \ + done source/demos: copy_demos From f38b012adf8a902a6602899c89bcc8f41f1ed5cb Mon Sep 17 00:00:00 2001 From: Joe Wallwork Date: Mon, 17 Nov 2025 08:22:03 +0000 Subject: [PATCH 4/4] set -e in Makefile --- docs/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/Makefile b/docs/Makefile index ccb3068..f5450e0 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -24,6 +24,7 @@ help: GENERATED_FILES = source/demos run_animate_demos: + set -e && \ cd ${ANIMATE}/demos/ && \ for FILE in *.py; do \ echo "Running Animate demo $$FILE"; \ @@ -31,6 +32,7 @@ run_animate_demos: done run_goalie_demos: + set -e && \ SKIP_DEMOS="time_partition.py gray_scott.py gray_scott_split.py"; \ cd ${GOALIE}/demos/ && \ for FILE in *.py; do \ @@ -43,6 +45,7 @@ run_goalie_demos: done run_movement_demos: + set -e && \ SKIP_DEMOS="monge_ampere_3d.py"; \ cd ${MOVEMENT}/demos/ && \ for FILE in *.py; do \