From de4b71ea37f3d3b0cfa219325ea5d628859f8b1b Mon Sep 17 00:00:00 2001
From: Erik Sundell <erik.i.sundell@gmail.com>
Date: Sat, 8 Oct 2022 14:22:45 +0200
Subject: [PATCH] ci: update to ubuntu 22.04 runners

---
 .github/workflows/docker.yml  |  2 +-
 .github/workflows/release.yml |  4 ++--
 .github/workflows/test.yml    | 11 ++++++++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bd745a24..33b74473 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 22580ceb..ec9f089e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -27,7 +27,7 @@ on:
 
 jobs:
   build-n-publish:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -53,7 +53,7 @@ jobs:
           password: ${{ secrets.PYPI_PASSWORD }}
 
   publish-docker:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       DEFAULT_REGISTRY: quay.io
       IMAGE_NAME: jupyterhub/repo2docker
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 285b42fa..f563bf15 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -40,7 +40,7 @@ env:
 
 jobs:
   pre-commit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
@@ -66,11 +66,12 @@ jobs:
 
   test:
     needs: pre-commit
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-${{ matrix.ubuntu_version }}"
 
     strategy:
       fail-fast: false  # Do not cancel all jobs if one fails
       matrix:
+        ubuntu_version: ["22.04"]
         python_version: ["3.8"]
         repo_type:
           - base
@@ -84,7 +85,11 @@ jobs:
           - unit
           - venv
         include:
-          - python_version: "3.6"
+          # The actions/setup-python action with Python version 3.6 isn't
+          # possible to use with the ubuntu-22.04 runner, so we use ubuntu-20.04
+          # for this test where Python 3.6 remain available.
+          - ubuntu_version: "20.04"
+            python_version: "3.6"
             repo_type: venv
 
     steps: