From cdd8f3caadb327e320fdd445bfc03fb1f57159b4 Mon Sep 17 00:00:00 2001 From: Stephan Kramer Date: Fri, 12 Jun 2026 11:17:23 +0100 Subject: [PATCH 1/3] Install build requirements for animate Adds `pip install -r animate/requirements-build.txt` step before building/installing animate. This is needed in the release container because there firedrake is installed directly from a pypi wheel and thus build requirements like Cython and a recent enough setuptools are not available. In the main container firedrake has been built locally and thus these are available already. Adding steps in both cases though for consistency. See https://github.com/mesh-adaptation/animate/pull/241 --- docker/Dockerfile.firedrake-parmmg | 1 + docker/Dockerfile.firedrake-parmmg_release | 1 + 2 files changed, 2 insertions(+) diff --git a/docker/Dockerfile.firedrake-parmmg b/docker/Dockerfile.firedrake-parmmg index 8f31288..eaf8fc9 100644 --- a/docker/Dockerfile.firedrake-parmmg +++ b/docker/Dockerfile.firedrake-parmmg @@ -24,6 +24,7 @@ RUN git clone https://github.com/mesh-adaptation/adapt_common.git && \ cd animate && git submodule init && git submodule update && cd .. && \ cd movement && git submodule init && git submodule update && cd .. && \ pip install -e adapt_common[dev] && \ + pip install -r animate/requirements-build.txt && \ pip install --no-build-isolation -e animate[dev] && \ pip install -e movement[dev] && \ pip install -e goalie[dev] diff --git a/docker/Dockerfile.firedrake-parmmg_release b/docker/Dockerfile.firedrake-parmmg_release index 033e2fb..091be90 100644 --- a/docker/Dockerfile.firedrake-parmmg_release +++ b/docker/Dockerfile.firedrake-parmmg_release @@ -24,6 +24,7 @@ RUN git clone https://github.com/mesh-adaptation/adapt_common.git && \ cd animate && git submodule init && git submodule update && cd .. && \ cd movement && git submodule init && git submodule update && cd .. && \ pip install -e adapt_common[dev] && \ + pip install -r animate/requirements-build.txt && \ pip install --no-build-isolation -e animate[dev] && \ pip install -e movement[dev] && \ pip install -e goalie[dev] From 1953e6098417b81606b25c1ff70374018cac9357 Mon Sep 17 00:00:00 2001 From: Stephan Kramer Date: Fri, 12 Jun 2026 15:58:54 +0100 Subject: [PATCH 2/3] Firedrake-parmmg:release should be triggered by its own Dockerfile. --- .github/workflows/docker_firedrake-parmmg_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_firedrake-parmmg_release.yml b/.github/workflows/docker_firedrake-parmmg_release.yml index 6d3cb87..92d124f 100644 --- a/.github/workflows/docker_firedrake-parmmg_release.yml +++ b/.github/workflows/docker_firedrake-parmmg_release.yml @@ -6,7 +6,7 @@ on: paths: - '.github/workflows/reusable_docker_build.yml' - '.github/workflows/docker_firedrake-parmmg_release.yml' - - 'docker/Dockerfile.firedrake-parmmg' + - 'docker/Dockerfile.firedrake-parmmg_release' - 'docker/Dockerfile.firedrake-um2n' # Build and push the Docker container when these files get changed on the main branch @@ -16,7 +16,7 @@ on: paths: - '.github/workflows/reusable_docker_build.yml' - '.github/workflows/docker_firedrake-parmmg_release.yml' - - 'docker/Dockerfile.firedrake-parmmg' + - 'docker/Dockerfile.firedrake-parmmg_release' - 'docker/Dockerfile.firedrake-um2n' # Run test suite at 1AM on the first of the month From 99cdbae50b6bd2503221450e61506b9c85cd6a42 Mon Sep 17 00:00:00 2001 From: Stephan Kramer Date: Sat, 13 Jun 2026 11:22:47 +0100 Subject: [PATCH 3/3] Fix spurious $$ in workflow. --- .github/workflows/docker_firedrake-parmmg_main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_firedrake-parmmg_main.yml b/.github/workflows/docker_firedrake-parmmg_main.yml index 750ae06..7d0ed87 100644 --- a/.github/workflows/docker_firedrake-parmmg_main.yml +++ b/.github/workflows/docker_firedrake-parmmg_main.yml @@ -30,7 +30,7 @@ permissions: {} # Stop the workflow if a new run is requested concurrency: - group: $${{ github.workflow }}-${{ github.ref }} + group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: