Skip to content

Commit 8d5c334

Browse files
authored
undo CI tweaks
1 parent b6f84c0 commit 8d5c334

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

.github/workflows/build.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ jobs:
5656
rm -rf firedrake_venv
5757
- name: Build Firedrake
5858
run: |
59-
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
6059
cd ..
6160
# Linting should ignore unquoted shell variable $COMPLEX
6261
# shellcheck disable=SC2086
6362
./firedrake/scripts/firedrake-install \
6463
$COMPLEX \
64+
--honour-petsc-dir \
6565
--mpicc="$MPICH_DIR"/mpicc \
6666
--mpicxx="$MPICH_DIR"/mpicxx \
6767
--mpif90="$MPICH_DIR"/mpif90 \
@@ -87,15 +87,13 @@ jobs:
8787
|| (cat firedrake-install.log && /bin/false)
8888
- name: Install test dependencies
8989
run: |
90-
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
9190
. ../firedrake_venv/bin/activate
9291
python "$(which firedrake-clean)"
9392
python -m pip install \
9493
pytest-xdist pytest-timeout ipympl
9594
python -m pip list
9695
- name: Test Firedrake
9796
run: |
98-
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
9997
. ../firedrake_venv/bin/activate
10098
echo OMP_NUM_THREADS is "$OMP_NUM_THREADS"
10199
echo OPENBLAS_NUM_THREADS is "$OPENBLAS_NUM_THREADS"
@@ -121,7 +119,6 @@ jobs:
121119
- name: Test pyadjoint
122120
if: ${{ matrix.scalar-type == 'real' }}
123121
run: |
124-
unset PETSC_DIR PETSC_ARCH SLEPC_DIR
125122
. ../firedrake_venv/bin/activate
126123
cd ../firedrake_venv/src/pyadjoint
127124
python -m pytest \

0 commit comments

Comments
 (0)