diff --git a/.github/workflows/test_firedrake_install.yml b/.github/workflows/test_firedrake_install.yml index c2999d8..6f26149 100644 --- a/.github/workflows/test_firedrake_install.yml +++ b/.github/workflows/test_firedrake_install.yml @@ -47,7 +47,7 @@ jobs: - name: 'Install Firedrake' run: | yes | make install - cd firedrake-* + cd firedrake-*/ echo "FIREDRAKE_ENV=$(pwd)" >> $GITHUB_ENV - name: 'Upload firedrake-install.log as an artifact' @@ -65,7 +65,7 @@ jobs: cd $FIREDRAKE_ENV/src git clone https://github.com/mesh-adaptation/animate.git cd animate - make install + make install_dev make test - name: 'Install and test Goalie' @@ -75,7 +75,7 @@ jobs: cd $FIREDRAKE_ENV/src git clone https://github.com/mesh-adaptation/goalie.git cd goalie - make install + make install_dev make test - name: 'Install and test Movement' @@ -85,5 +85,5 @@ jobs: cd $FIREDRAKE_ENV/src git clone https://github.com/mesh-adaptation/movement.git cd movement - make install + make install_dev make test diff --git a/docker/Dockerfile.firedrake-parmmg b/docker/Dockerfile.firedrake-parmmg index 3640994..113036c 100644 --- a/docker/Dockerfile.firedrake-parmmg +++ b/docker/Dockerfile.firedrake-parmmg @@ -155,6 +155,6 @@ RUN curl -O https://raw.githubusercontent.com/firedrakeproject/firedrake/master/ git clone https://github.com/mesh-adaptation/animate.git && \ git clone https://github.com/mesh-adaptation/movement.git && \ git clone https://github.com/mesh-adaptation/goalie.git && \ - cd animate && make install && \ - cd ../movement && make install && \ - cd ../goalie && make install" + cd animate && make install_dev && \ + cd ../movement && make install_dev && \ + cd ../goalie && make install_dev" diff --git a/docker/Dockerfile.firedrake-um2n b/docker/Dockerfile.firedrake-um2n index ef6ce65..99acf6e 100644 --- a/docker/Dockerfile.firedrake-um2n +++ b/docker/Dockerfile.firedrake-um2n @@ -11,7 +11,7 @@ RUN bash -c "source firedrake/bin/activate && \ cd firedrake/src && \ git clone https://github.com/mesh-adaptation/UM2N.git && \ python3 -m pip uninstall cffconvert -y && \ - python3 -m pip install -e UM2N" + python3 -m pip install -e UM2N[dev]" # NOTE: cffconvert is not currently used in UM2N and requires a conflicting # version of jsonschema with other dependencies.