Merge branch 'main' of https://github.com/nikita-bykov/setup-python into add-templates

This commit is contained in:
Nikita Bykov 2021-10-20 09:52:02 +03:00
commit 111949e7ab
2 changed files with 5 additions and 6 deletions

View file

@ -21,12 +21,11 @@ jobs:
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-latest] os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-latest]
pypy: pypy:
- 'pypy-2.7' - 'pypy-2.7'
- 'pypy-3.6'
- 'pypy-3.7' - 'pypy-3.7'
- 'pypy-2.7-v7.3.2' - 'pypy-2.7-v7.3.4'
- 'pypy-3.6-v7.3.2' - 'pypy-3.7-v7.3.5'
- 'pypy-3.7-v7.3.2' - 'pypy-3.7-v7.3.4'
- 'pypy-3.6-v7.3.x' - 'pypy-3.7-v7.3.x'
- 'pypy-3.7-v7.x' - 'pypy-3.7-v7.x'
- 'pypy-2.7-v7.3.4rc1' - 'pypy-2.7-v7.3.4rc1'
- 'pypy-3.7-nightly' - 'pypy-3.7-nightly'

View file

@ -97,7 +97,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
os: [macos-latest, windows-latest, ubuntu-18.04, ubuntu-20.04] os: [macos-10.15, windows-latest, ubuntu-18.04, ubuntu-20.04]
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2