Remove Ubuntu 18.04 from GithHub and add Upuntu 22.04.

gcovr · Oct 25, 2022 · f5cc5d6 · f5cc5d6
1 parent 1e0a371
commit f5cc5d6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -29,7 +29,7 @@ jobs:
         admin/release_checklist $EXTRA_CHECKLIST_ARGS 5.2
 
   deploy:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     needs: release-check
 
     env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,7 +11,7 @@ on:
 jobs:
 
   milestone-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     continue-on-error: true
 
@@ -30,7 +30,7 @@ jobs:
         exit 0
 
   changelog-check:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     env:
       PR_BODY: "${{ github.event.pull_request.body }}"
@@ -93,15 +93,12 @@ jobs:
         include:
 
           # Test additional compilers with Linux.
-          # Note that Clang-10 and Clang-13 is handled via Docker.
-          - os: ubuntu-18.04
-            gcc: gcc-5
-            python-version: '3.8'
-          - os: ubuntu-18.04
-            gcc: gcc-6
-            python-version: '3.8'
+          # Note that gcc-5, gcc-6, clang-10 and clang-13 is handled via Docker.
           - os: ubuntu-20.04
             gcc: gcc-9
+            python-version: '3.9'
+          - os: ubuntu-22.04
+            gcc: gcc-11
             python-version: '3.10'
 
           # Test minimum and maximum Python version on Windows.
@@ -119,7 +116,7 @@ jobs:
         # Enable coverage for specific target configurations
         case "${{ matrix.os }}/${{ matrix.gcc }}/${{ matrix.python-version }}" in
           windows-2019/gcc-8/3.7) USE_COVERAGE=true ;;
-          ubuntu-18.04/gcc-6/3.8) USE_COVERAGE=true ;;
+          ubuntu-20.04/gcc-9/3.9) USE_COVERAGE=true ;;
           *)                      USE_COVERAGE=false ;;
         esac
         echo USE_COVERAGE=$USE_COVERAGE >> $GITHUB_ENV
@@ -183,7 +180,7 @@ jobs:
         make doc
 
   run-docker:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     needs: [milestone-check, changelog-check]
 
     strategy:

diff --git a/doc/source/installation.rst b/doc/source/installation.rst
@@ -29,7 +29,7 @@ Python:
 Operating System:
     Linux, Windows, and macOS.
 
-    The automated tests run on Ubuntu 18.04 and 20.04 and Windows Server 2019.
+    The automated tests run on Ubuntu 20.04, 22.04 and Windows Server 2019.
 
 Compiler:
     GCC and Clang.