diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8a5e2391f3..ad6ca5a993 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -57,12 +57,12 @@ jobs: rm -rf firedrake_venv - name: Build Firedrake run: | + unset PETSC_ARCH PETSC_DIR SLEPC_DIR HDF5_DIR cd .. # Linting should ignore unquoted shell variable $COMPLEX # shellcheck disable=SC2086 ./firedrake/scripts/firedrake-install \ $COMPLEX \ - --honour-petsc-dir \ --mpicc="$MPICH_DIR"/mpicc \ --mpicxx="$MPICH_DIR"/mpicxx \ --mpif90="$MPICH_DIR"/mpif90 \ @@ -81,6 +81,8 @@ jobs: --install irksome \ --install femlium \ --install fascd \ + --package-branch petsc ksagiyam/merge_upstream \ + --package-branch slepc ksagiyam/merge_upstream \ || (cat firedrake-install.log && /bin/false) - name: Install test dependencies run: | @@ -91,6 +93,7 @@ jobs: python -m pip list - name: Test Firedrake run: | + unset PETSC_ARCH PETSC_DIR SLEPC_DIR HDF5_DIR . ../firedrake_venv/bin/activate echo OMP_NUM_THREADS is "$OMP_NUM_THREADS" echo OPENBLAS_NUM_THREADS is "$OPENBLAS_NUM_THREADS" @@ -107,6 +110,7 @@ jobs: - name: Test pyadjoint if: ${{ matrix.scalar-type == 'real' }} run: | + unset PETSC_ARCH PETSC_DIR SLEPC_DIR HDF5_DIR . ../firedrake_venv/bin/activate cd ../firedrake_venv/src/pyadjoint python -m pytest \