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: 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 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]