Skip to content

Commit e083f43

Browse files
committed
workflows: Move to Ubuntu 24.04
This gets rid of the podman backport PPA, and thus finally runs the integration test on the *exact* same machinery as the production build (which previously has led to problems like in #628). We can now also stop repeating the test dependencies.
1 parent de95a7b commit e083f43

File tree

2 files changed

+5
-14
lines changed

2 files changed

+5
-14
lines changed

.github/workflows/build-tasks.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
matrix:
2121
build:
2222
- label: amd64
23-
runner: ubuntu-22.04
23+
runner: ubuntu-24.04
2424
- label: arm64
2525
runner: buildjet-2vcpu-ubuntu-2204-arm
2626

@@ -50,7 +50,7 @@ jobs:
5050
manifest:
5151
needs: build
5252

53-
runs-on: ubuntu-22.04
53+
runs-on: ubuntu-24.04
5454
timeout-minutes: 5
5555

5656
steps:

.github/workflows/tests.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: tests
22
on: [pull_request]
33
jobs:
44
unit-tests:
5-
runs-on: ubuntu-22.04
5+
runs-on: ubuntu-24.04
66
steps:
77
- name: Clone repository
88
uses: actions/checkout@v4
@@ -11,14 +11,13 @@ jobs:
1111
run: |
1212
sudo apt-get update
1313
sudo apt-get install -y make python3-pyflakes python3-pycodestyle python3-pip python3-pytest
14-
# `pip install .[test]` does not work properly on Ubuntu 22.04
15-
sudo pip install ruff mypy types-PyYAML
14+
sudo pip install .[test]
1615
1716
- name: Run lint tests
1817
run: make check
1918

2019
tasks:
21-
runs-on: ubuntu-22.04
20+
runs-on: ubuntu-24.04
2221
permissions:
2322
# enough permissions for tests-scan to work
2423
pull-requests: read
@@ -42,14 +41,6 @@ jobs:
4241
sudo apt-get update
4342
sudo apt-get install -y make python3-pytest
4443
45-
# HACK: Ubuntu 22.04 has podman 3.4, which isn't compatible with podman-remote 4 in our tasks container
46-
# This PPA is a backport of podman 4.3 from Debian 12; drop this when moving `runs-on:` to ubuntu-24.04
47-
- name: Update to newer podman
48-
run: |
49-
sudo add-apt-repository -y ppa:quarckster/containers
50-
sudo apt install -y podman
51-
systemctl --user daemon-reload
52-
5344
- name: Check which containers changed
5445
id: containers_changed
5546
run: |

0 commit comments

Comments
 (0)