From 552ca81af404f520d6ce183bba968d791dd9a574 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Tue, 16 Aug 2022 18:12:19 +0200 Subject: ci: Update to macOS 11, add 12 See https://github.com/actions/runner-images/issues/5583 --- .github/workflows/ci.yml | 14 +++++++------- .github/workflows/nightly.yml | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1ecb8dfe..7a0fbb636 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -138,16 +138,16 @@ jobs: - testenv: py311-pyqt515 os: ubuntu-20.04 python: "3.11-dev" - ### macOS: PyQt 5.15 (Python 3.9 to match PyInstaller env) + ### macOS Big Sur: PyQt 5.15 (Python 3.9 to match PyInstaller env) - testenv: py39-pyqt515 - os: macos-10.15 + os: macos-11 python: "3.9" args: "tests/unit" # Only run unit tests on macOS - ### macOS Big Sur - # - testenv: py39-pyqt515 - # os: macos-11.0 - # python: "3.9" - # args: "tests/unit" # Only run unit tests on macOS + ### macOS Monterey + - testenv: py39-pyqt515 + os: macos-12 + python: "3.9" + args: "tests/unit" # Only run unit tests on macOS ### Windows: PyQt 5.15 (Python 3.9 to match PyInstaller env) - testenv: py39-pyqt515 os: windows-2019 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index f6bdff2d7..073f2c69c 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -14,7 +14,7 @@ jobs: fail-fast: false matrix: include: - - os: macos-10.15 + - os: macos-11 branch: master toxenv: build-release name: macos @@ -29,7 +29,7 @@ jobs: toxenv: build-release name: windows-32bit - - os: macos-10.15 + - os: macos-11 args: --debug branch: master toxenv: build-release @@ -45,7 +45,7 @@ jobs: toxenv: build-release name: windows-32bit-debug - - os: macos-10.15 + - os: macos-11 branch: qt6-v2 toxenv: build-release-qt6 name: qt6-macos @@ -54,7 +54,7 @@ jobs: branch: qt6-v2 toxenv: build-release-qt6 name: qt6-windows-64bit - - os: macos-10.15 + - os: macos-11 args: --debug branch: qt6-v2 toxenv: build-release-qt6 -- cgit v1.2.3-54-g00ecf