Skip to content

Commit

Permalink
workflows: Move to Ubuntu 24.04
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
martinpitt committed Dec 13, 2024
1 parent 29cd96e commit e7990c6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
build:
- label: amd64
runner: ubuntu-22.04
runner: ubuntu-24.04
- label: arm64
runner: buildjet-2vcpu-ubuntu-2204-arm

Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
manifest:
needs: build

runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 5

steps:
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: tests
on: [pull_request]
jobs:
unit-tests:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Clone repository
uses: actions/checkout@v4
Expand All @@ -11,14 +11,13 @@ jobs:
run: |
sudo apt-get update
sudo apt-get install -y make python3-pyflakes python3-pycodestyle python3-pip python3-pytest
# `pip install .[test]` does not work properly on Ubuntu 22.04
sudo pip install ruff mypy types-PyYAML
sudo pip install .[test]
- name: Run lint tests
run: make check

tasks:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
permissions:
# enough permissions for tests-scan to work
pull-requests: read
Expand All @@ -42,14 +41,6 @@ jobs:
sudo apt-get update
sudo apt-get install -y make python3-pytest
# HACK: Ubuntu 22.04 has podman 3.4, which isn't compatible with podman-remote 4 in our tasks container
# This PPA is a backport of podman 4.3 from Debian 12; drop this when moving `runs-on:` to ubuntu-24.04
- name: Update to newer podman
run: |
sudo add-apt-repository -y ppa:quarckster/containers
sudo apt install -y podman
systemctl --user daemon-reload
- name: Check which containers changed
id: containers_changed
run: |
Expand Down

0 comments on commit e7990c6

Please sign in to comment.