undo ci testing tweaks

firedrakeproject · Dec 4, 2024 · b6d14f7 · b6d14f7
1 parent 2edb4f5
commit b6d14f7
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -48,8 +48,6 @@ jobs:
       COMPLEX: ${{ matrix.complex }}
       RDMAV_FORK_SAFE: 1
     steps:
-      - name: Install pkg-config  # just for testing, will be put into firedrake-env
-        run: sudo apt update && sudo apt install -y pkg-config
       - uses: actions/checkout@v4
       - name: Cleanup
         if: ${{ always() }}
@@ -58,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 \
@@ -85,20 +83,16 @@ jobs:
             --install defcon \
             --install gadopt \
             --install asQ \
-            --package-branch petsc connorjward/merge-upstream \
-            --package-branch slepc 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 \
             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"
@@ -124,7 +118,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 \