ci: Upgrade some jobs from Ubuntu 20.04 to 24.04

Ubuntu 20.04 will be EOL in April 2025, and PyQt 6.8 does not support being
installed on it anymore:
https://pyqt-builder.readthedocs.io/en/stable/releases.html

Other than for the oldest Qt 5 / Qt 6 envs, and for utility envs, let's use
Ubuntu 22.04 or 24.04.
This commit is contained in:
Florian Bruhin 2024-12-14 21:18:47 +01:00
parent 2546c0746d
commit 531b28771c
5 changed files with 13 additions and 13 deletions

View File

@ -10,7 +10,7 @@ on:
jobs:
tests:
if: "github.repository == 'qutebrowser/qutebrowser'"
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 45
strategy:
fail-fast: false
@ -61,7 +61,7 @@ jobs:
irc:
timeout-minutes: 2
continue-on-error: true
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: [tests]
if: "always() && github.repository == 'qutebrowser/qutebrowser'"
steps:

View File

@ -155,7 +155,7 @@ jobs:
# python: "3.10"
### PyQt 5.15 (Python 3.11)
- testenv: py311-pyqt515
os: ubuntu-20.04
os: ubuntu-22.04
python: "3.11"
### PyQt 6.2 (Python 3.9)
- testenv: py39-pyqt62
@ -163,11 +163,11 @@ jobs:
python: "3.9"
### PyQt 6.3 (Python 3.9)
- testenv: py39-pyqt63
os: ubuntu-20.04
os: ubuntu-22.04
python: "3.9"
## PyQt 6.4 (Python 3.9)
- testenv: py39-pyqt64
os: ubuntu-20.04
os: ubuntu-22.04
python: "3.9"
### PyQt 6.5 (Python 3.10)
- testenv: py310-pyqt65
@ -191,7 +191,7 @@ jobs:
python: "3.12"
### PyQt 6.8 (Python 3.13)
- testenv: py313-pyqt68
os: ubuntu-22.04
os: ubuntu-24.04
python: "3.13"
### macOS Ventura
- testenv: py313-pyqt68

View File

@ -8,7 +8,7 @@ on:
jobs:
docker:
if: "github.repository == 'qutebrowser/qutebrowser'"
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
@ -42,7 +42,7 @@ jobs:
irc:
timeout-minutes: 2
continue-on-error: true
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: [docker]
if: "always() && github.repository == 'qutebrowser/qutebrowser'"
steps:

View File

@ -75,7 +75,7 @@ jobs:
irc:
timeout-minutes: 2
continue-on-error: true
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: [pyinstaller]
if: "always() && github.repository == 'qutebrowser/qutebrowser'"
steps:

View File

@ -26,7 +26,7 @@ on:
- '3.13'
jobs:
prepare:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 5
outputs:
version: ${{ steps.bump.outputs.version }}
@ -129,7 +129,7 @@ jobs:
- os: macos-13
- os: macos-14
- os: windows-2019
- os: ubuntu-20.04
- os: ubuntu-24.04
runs-on: "${{ matrix.os }}"
timeout-minutes: 45
needs: [prepare]
@ -173,7 +173,7 @@ jobs:
TWINE_PASSWORD: ${{ secrets.QUTEBROWSER_BOT_PYPI_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
finalize:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
timeout-minutes: 5
needs: [prepare, release]
permissions:
@ -193,7 +193,7 @@ jobs:
irc:
timeout-minutes: 2
continue-on-error: true
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
needs: [prepare, release, finalize]
if: "${{ always() }}"
steps: