Undo build.yml changes

firedrakeproject · Oct 9, 2024 · b9af84b · b9af84b
1 parent 4bb607a
commit b9af84b
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -62,6 +62,7 @@ jobs:
           # shellcheck disable=SC2086
           ./firedrake/scripts/firedrake-install \
             $COMPLEX \
+            --honour-petsc-dir \
             --mpicc="$MPICH_DIR"/mpicc \
             --mpicxx="$MPICH_DIR"/mpicxx \
             --mpif90="$MPICH_DIR"/mpif90 \
@@ -83,20 +84,16 @@ jobs:
             --install defcon \
             --install gadopt \
             --install asQ \
-            --package-branch petsc JDBetteridge/merge_upstream \
-            --package-branch slepc JDBetteridge/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 \
             pytest-xdist pytest-timeout ipympl
           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"
@@ -122,7 +119,6 @@ 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 \