Merge pull request #196 from nulano/gha-ubuntu

Change workflow to use ubuntu-20.04
This commit is contained in:
Andrew Murray 2021-05-09 15:26:26 +10:00 committed by GitHub
commit 99993ca972
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -16,7 +16,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ "ubuntu-16.04", "macos-latest" ] os: [ "ubuntu-20.04", "macos-latest" ]
python: [ "pypy3.7-7.3.3","pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ] python: [ "pypy3.7-7.3.3","pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ]
platform: [ "x86_64", "i686" ] platform: [ "x86_64", "i686" ]
macos-target: [ "10.10" ] macos-target: [ "10.10" ]
@ -26,8 +26,8 @@ jobs:
include: include:
- os: "macos-latest" - os: "macos-latest"
os-name: "osx" os-name: "osx"
- os: "ubuntu-16.04" - os: "ubuntu-20.04"
os-name: "xenial" os-name: "focal"
# Disable whilst not available # Disable whilst not available
# - os: "macos-11.0" # - os: "macos-11.0"
# os-name: "osx" # os-name: "osx"
@ -65,7 +65,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [ "ubuntu-16.04", "macos-latest" ] os: [ "ubuntu-20.04", "macos-latest" ]
python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ] python: [ "pypy3.7-7.3.3", "pypy3.6-7.3.3", "3.6", "3.7", "3.8", "3.9" ]
platform: [ "x86_64", "i686" ] platform: [ "x86_64", "i686" ]
macos-target: [ "10.10" ] macos-target: [ "10.10" ]
@ -75,8 +75,8 @@ jobs:
include: include:
- os: "macos-latest" - os: "macos-latest"
os-name: "osx" os-name: "osx"
- os: "ubuntu-16.04" - os: "ubuntu-20.04"
os-name: "xenial" os-name: "focal"
- os: "macos-11.0" - os: "macos-11.0"
os-name: "osx" os-name: "osx"
platform: "arm64" platform: "arm64"