Merge pull request #23584 from oscargus/ubuntu20.04

tacaswell · web-flow · commit 384a92ed6cdc · 2022-08-09T17:10:20.000-04:00
CI: Bump Ubuntu to 20.04 on GitHub Actions
diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml
@@ -35,10 +35,10 @@ jobs:
       MACOSX_DEPLOYMENT_TARGET: "10.12"
     strategy:
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-10.15]
+        os: [ubuntu-20.04, windows-latest, macos-10.15]
         cibw_archs: ["auto"]
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             cibw_archs: "aarch64"
 
     steps:
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -33,12 +33,12 @@ jobs:
       matrix:
         include:
           - name-suffix: "(Minimum Versions)"
-            os: ubuntu-18.04
+            os: ubuntu-20.04
             python-version: 3.8
             extra-requirements: '-c requirements/testing/minver.txt'
             pyqt5-ver: '==5.11.2 sip==5.0.0'  # oldest versions with a Py3.8 wheel.
             delete-font-cache: true
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             python-version: 3.8
             extra-requirements: '-r requirements/testing/extra.txt'
             CFLAGS: "-fno-lto"  # Ensure that disabling LTO works.
@@ -192,7 +192,6 @@ jobs:
               echo 'PySide2 is available' ||
               echo 'PySide2 is not available'
           fi
-          # Qt6 crashes on Github's ubuntu 18.04 runner.
           if [[ "${{ matrix.os }}" = ubuntu-20.04 ]]; then
             python -mpip install --upgrade pyqt6 &&
               python -c 'import PyQt6.QtCore' &&
