From 531b28771c52b4df77587603a93337cb21c40507 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 14 Dec 2024 21:18:47 +0100
Subject: [PATCH] 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.
---
 .github/workflows/bleeding.yml | 4 ++--
 .github/workflows/ci.yml       | 8 ++++----
 .github/workflows/docker.yml   | 4 ++--
 .github/workflows/nightly.yml  | 2 +-
 .github/workflows/release.yml  | 8 ++++----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/bleeding.yml b/.github/workflows/bleeding.yml
index baafa1983..98c43dc7b 100644
--- a/.github/workflows/bleeding.yml
+++ b/.github/workflows/bleeding.yml
@@ -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:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4f6bc1326..16bfde3d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 0947af2b8..75f9c9082 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -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:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index a1f28d343..daf148368 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -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:
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fb2b0f589..0823c883c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -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: