From 2c705386a9a2e8a11260cb3faa89d73e12446d2e Mon Sep 17 00:00:00 2001 From: Oscar Gustafsson Date: Mon, 8 Aug 2022 16:35:58 +0200 Subject: [PATCH] Bump Ubuntu to 20.04 on GitHub Actions --- .github/workflows/cibuildwheel.yml | 4 ++-- .github/workflows/tests.yml | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cibuildwheel.yml b/.github/workflows/cibuildwheel.yml index 20bd91221c43..1b744b168526 100644 --- 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 index 56db895a7620..b8336ff74bb3 100644 --- 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' &&