From d95bf111da15890012a9d47f170da2467f436e19 Mon Sep 17 00:00:00 2001 From: Connor Date: Wed, 6 Nov 2024 10:10:45 +0000 Subject: [PATCH] DO NOT MERGE Test updated PETSc --- .github/workflows/build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0fff428f43..73c46151e8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -56,12 +56,12 @@ jobs: rm -rf firedrake_venv - name: Build Firedrake run: | + unset PETSC_DIR PETSC_ARCH SLEPC_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 \ @@ -83,9 +83,11 @@ jobs: --install defcon \ --install gadopt \ --install asQ \ + --package-branch petsc connorjward/merge-upstream \ || (cat firedrake-install.log && /bin/false) - name: Install test dependencies run: | + unset PETSC_DIR PETSC_ARCH SLEPC_DIR . ../firedrake_venv/bin/activate python "$(which firedrake-clean)" python -m pip install \ @@ -93,6 +95,7 @@ jobs: python -m pip list - name: Test Firedrake run: | + unset PETSC_DIR PETSC_ARCH SLEPC_DIR . ../firedrake_venv/bin/activate echo OMP_NUM_THREADS is "$OMP_NUM_THREADS" echo OPENBLAS_NUM_THREADS is "$OPENBLAS_NUM_THREADS" @@ -118,6 +121,7 @@ jobs: - name: Test pyadjoint if: ${{ matrix.scalar-type == 'real' }} run: | + unset PETSC_DIR PETSC_ARCH SLEPC_DIR . ../firedrake_venv/bin/activate cd ../firedrake_venv/src/pyadjoint python -m pytest \