Skip to content

Commit 2e08756

Browse files
committed
fixup
1 parent 15373b7 commit 2e08756

2 files changed

Lines changed: 21 additions & 20 deletions

File tree

.github/actions/install/action.yml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,6 @@ runs:
5050
brew install $(python3 ./firedrake-repo/scripts/firedrake-configure --arch default --show-system-packages)
5151
fi
5252
53-
# TODO: these checks can be a separate workflow
54-
- name: Validate single source of truth
55-
shell: bash
56-
run: ./firedrake-repo/scripts/check-config
57-
58-
# Check that the Dockerfile is using the latest Ubuntu version.
59-
# The version is hardcoded into the Dockerfile so that the OS
60-
# for each release is fixed.
61-
- name: Check Dockerfile Ubuntu version
62-
shell: bash
63-
run: |
64-
latest_version=$(grep "VERSION_ID=" /etc/os-release | cut -d '"' -f 2)
65-
docker_version=$(grep FROM firedrake-repo/docker/Dockerfile.vanilla | cut -d ':' -f 2)
66-
echo "Latest version: $latest_version"
67-
echo "Docker version: $docker_version"
68-
if [[ "$docker_version" != "$latest_version" ]]; then
69-
echo "Ubuntu version ${docker_version} in Dockerfile is out of date with latest version ${latest_version}"
70-
exit 1
71-
fi
72-
7353
- name: Install PETSc
7454
shell: bash
7555
run: |

.github/workflows/core.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,27 @@ jobs:
134134
root_dir: /__w/firedrake/firedrake
135135
deps: ci
136136

137+
# TODO: these checks can be a separate workflow
138+
- name: Validate single source of truth
139+
shell: bash
140+
run: ./firedrake-repo/scripts/check-config
141+
142+
# Check that the Dockerfile is using the latest Ubuntu version.
143+
# The version is hardcoded into the Dockerfile so that the OS
144+
# for each release is fixed.
145+
- name: Check Dockerfile Ubuntu version
146+
shell: bash
147+
run: |
148+
latest_version=$(grep "VERSION_ID=" /etc/os-release | cut -d '"' -f 2)
149+
docker_version=$(grep FROM firedrake-repo/docker/Dockerfile.vanilla | cut -d ':' -f 2)
150+
echo "Latest version: $latest_version"
151+
echo "Docker version: $docker_version"
152+
if [[ "$docker_version" != "$latest_version" ]]; then
153+
echo "Ubuntu version ${docker_version} in Dockerfile is out of date with latest version ${latest_version}"
154+
exit 1
155+
fi
156+
157+
137158
- name: Upload sdist (default ARCH only)
138159
if: matrix.arch == 'default'
139160
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)