Skip to content

Commit 15373b7

Browse files
committed
fixup
1 parent 715f2f0 commit 15373b7

2 files changed

Lines changed: 21 additions & 19 deletions

File tree

.github/actions/install/action.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,14 @@ inputs:
3333
runs:
3434
using: composite
3535
steps:
36-
- name: Pre-run cleanup
37-
shell: bash
38-
# Make sure the current directory is empty
39-
run: find . -delete
40-
4136
- name: Install system dependencies
4237
shell: bash
4338
run: |
4439
if [ ${{ inputs.os }} = 'linux' ]; then
40+
: # Git is needed for actions/checkout and Python for firedrake-configure
41+
apt-get update
42+
apt-get -y install git python3
43+
4544
apt-get -y install \
4645
$(python3 ./firedrake-repo/scripts/firedrake-configure --arch ${{ matrix.arch }} --show-system-packages)
4746
apt-get -y install python3-venv

.github/workflows/core.yml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -107,22 +107,21 @@ jobs:
107107
EXTRA_PYTEST_ARGS: --splitting-algorithm least_duration --timeout=600 --timeout-method=thread -o faulthandler_timeout=660 --durations-path=./firedrake-repo/tests/test_durations.json --durations=50
108108
PYTEST_MPI_MAX_NPROCS: 8
109109
steps:
110-
- uses: actions/checkout@v5
111-
with:
112-
path: firedrake-repo
113-
ref: ${{ inputs.source_ref }}
114-
110+
# NOTE: is this needed any more?
115111
- name: Fix HOME
116112
# For unknown reasons GitHub actions overwrite HOME to /github/home
117113
# which will break everything unless fixed
118114
# (https://github.com/actions/runner/issues/863)
119115
run: echo "HOME=/root" >> "$GITHUB_ENV"
120116

121-
# Git is needed for actions/checkout and Python for firedrake-configure
122-
- name: Install system dependencies (1)
123-
run: |
124-
apt-get update
125-
apt-get -y install git python3
117+
- name: Pre-run cleanup
118+
# Make sure the current directory is empty
119+
run: find . -delete
120+
121+
- uses: actions/checkout@v5
122+
with:
123+
path: firedrake-repo
124+
ref: ${{ inputs.source_ref }}
126125

127126
- name: Install Firedrake
128127
id: install
@@ -310,15 +309,19 @@ jobs:
310309
OMP_NUM_THREADS: 1
311310
OPENBLAS_NUM_THREADS: 1
312311
steps:
312+
- name: Add homebrew to PATH
313+
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#adding-a-system-path
314+
run: echo "/opt/homebrew/bin" >> "$GITHUB_PATH"
315+
316+
- name: Pre-run cleanup
317+
# Make sure the current directory is empty
318+
run: find . -delete
319+
313320
- uses: actions/checkout@v5
314321
with:
315322
path: firedrake-repo
316323
ref: ${{ inputs.source_ref }}
317324

318-
- name: Add homebrew to PATH
319-
# https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/workflow-commands-for-github-actions#adding-a-system-path
320-
run: echo "/opt/homebrew/bin" >> "$GITHUB_PATH"
321-
322325
- name: Install Firedrake
323326
id: install
324327
uses: ./firedrake-repo/.github/actions/install

0 commit comments

Comments
 (0)