Skip to content

Commit

Permalink
ci: Upgrade Ubuntu versions
Browse files Browse the repository at this point in the history
Avoid deprecated Ubuntu 20.04 which will be unsupported in April:
actions/runner-images#11101

For Qt 6.8 and auxiliary jobs (linters etc.), switch from 22.04 to 24.04.
  • Loading branch information
The-Compiler committed Feb 23, 2025
1 parent de8a2c0 commit 1a6d32c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bleeding.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
jobs:
tests:
if: "github.repository == 'qutebrowser/qutebrowser'"
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
timeout-minutes: 45
strategy:
fail-fast: false
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
linters:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
timeout-minutes: 10
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
tests-docker:
if: "!contains(github.event.head_commit.message, '[ci skip]')"
timeout-minutes: 45
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -146,7 +146,7 @@ jobs:
include:
### PyQt 5.15.2 (Python 3.9)
- testenv: py39-pyqt5152
os: ubuntu-20.04
os: ubuntu-22.04
python: "3.9"
### PyQt 5.15 (Python 3.10, with coverage)
# FIXME:qt6
Expand All @@ -159,7 +159,7 @@ jobs:
python: "3.11"
### PyQt 6.2 (Python 3.9)
- testenv: py39-pyqt62
os: ubuntu-20.04
os: ubuntu-22.04
python: "3.9"
### PyQt 6.3 (Python 3.9)
- testenv: py39-pyqt63
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -274,7 +274,7 @@ jobs:
permissions:
security-events: write
timeout-minutes: 15
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand All @@ -291,7 +291,7 @@ jobs:
irc:
timeout-minutes: 2
continue-on-error: true
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: [linters, tests, tests-docker, codeql]
if: "always() && github.repository_owner == 'qutebrowser'"
steps:
Expand Down

0 comments on commit 1a6d32c

Please sign in to comment.