Skip to content

Commit f893b61

Browse files
committed
ci: Bump Ubuntu ARM builder to 24.04
Since earlier today, the `ubuntu-22.04-arm` image has actually been Ubuntu 24.04. Instead of working out how to fix that, switch to the newer image explicitly.
1 parent 5cdd827 commit f893b61

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

.github/workflows/tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
extra-requirements: '-r requirements/testing/extra.txt'
6161
# https://github.com/matplotlib/matplotlib/issues/29844
6262
pygobject-ver: '<3.52.0'
63-
- os: ubuntu-22.04-arm
63+
- os: ubuntu-24.04-arm
6464
python-version: '3.12'
6565
# https://github.com/matplotlib/matplotlib/issues/29844
6666
pygobject-ver: '<3.52.0'
@@ -150,7 +150,7 @@ jobs:
150150
if [[ "${{ matrix.name-suffix }}" != '(Minimum Versions)' ]]; then
151151
sudo apt-get install -yy --no-install-recommends ffmpeg poppler-utils
152152
fi
153-
if [[ "${{ matrix.os }}" = ubuntu-22.04 || "${{ matrix.os }}" = ubuntu-22.04-arm ]]; then
153+
if [[ "${{ matrix.os }}" = ubuntu-22.04 ]]; then
154154
sudo apt-get install -yy --no-install-recommends \
155155
gir1.2-gtk-4.0 \
156156
libgirepository1.0-dev
@@ -257,7 +257,7 @@ jobs:
257257
)
258258
259259
# PyQt5 does not have any wheels for ARM on Linux.
260-
if [[ "${{ matrix.os }}" != 'ubuntu-22.04-arm' ]]; then
260+
if [[ "${{ matrix.os }}" != 'ubuntu-24.04-arm' ]]; then
261261
python -mpip install --upgrade --only-binary :all: pyqt5 &&
262262
python -c 'import PyQt5.QtCore' &&
263263
echo 'PyQt5 is available' ||
@@ -372,7 +372,7 @@ jobs:
372372
run: |
373373
if [[ "${{ runner.os }}" != 'macOS' ]]; then
374374
LCOV_IGNORE_ERRORS=',' # do not ignore any lcov errors by default
375-
if [[ "${{ matrix.os }}" = ubuntu-24.04 ]]; then
375+
if [[ "${{ matrix.os }}" = ubuntu-24.04 || "${{ matrix.os }}" = ubuntu-24.04-arm ]]; then
376376
# filter mismatch and unused-entity errors detected by lcov 2.x
377377
LCOV_IGNORE_ERRORS='mismatch,unused'
378378
fi

0 commit comments

Comments
 (0)