Skip to content

Commit

Permalink
Update various GitHub runners versions and Python versions on CI
Browse files Browse the repository at this point in the history
A bunch of the old ones are no longer available, so we are just going to
skip them. If people are still running old versions of Ubuntu with old
versions of Python, there isn't much to do.

Mostly the old versions are relevant on Windows and macOS.
  • Loading branch information
wbond committed Aug 15, 2023
1 parent d1ebb01 commit 133f770
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 20 deletions.
37 changes: 18 additions & 19 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
strategy:
matrix:
python:
- '3.9'
- '3.11'
# - 'pypy-3.7-v7.3.5'
arch:
- 'x86'
Expand Down Expand Up @@ -62,12 +62,12 @@ jobs:
run: python run.py ci-driver winlegacy

build-mac:
name: Python ${{ matrix.python }} on macos-12
runs-on: macos-12
name: Python ${{ matrix.python }} on macos-13
runs-on: macos-13
strategy:
matrix:
python:
- '3.9'
- '3.11'
steps:
- uses: actions/checkout@master
- uses: actions/setup-python@v2
Expand All @@ -86,13 +86,13 @@ jobs:
run: python run.py ci-driver cffi openssl

build-mac-legacy:
name: Python ${{ matrix.python }} on macos-10.15
runs-on: macos-10.15
name: Python ${{ matrix.python }} on macos-11
runs-on: macos-11
strategy:
matrix:
python:
- '2.7'
- '3.9'
- '3.7'
- '3.11'
steps:
- uses: actions/checkout@master
- uses: actions/setup-python@v2
Expand All @@ -111,12 +111,13 @@ jobs:
run: python run.py ci-driver cffi openssl

build-mac-old:
name: Python ${{ matrix.python }} on macos-10.15
runs-on: macos-10.15
name: Python ${{ matrix.python }} on macos-11
runs-on: macos-11
strategy:
matrix:
python:
- '2.6'
- '2.7'
- '3.3'
steps:
- uses: actions/checkout@master
Expand All @@ -126,7 +127,7 @@ jobs:
uses: actions/cache@v2
with:
path: ~/.pyenv
key: macos-10.15-${{ matrix.python }}-pyenv
key: macos-11-${{ matrix.python }}-pyenv

- name: Install Python ${{ matrix.python }}
run: python run.py pyenv-install ${{ matrix.python }} >> $GITHUB_PATH
Expand All @@ -143,13 +144,13 @@ jobs:
run: python run.py ci-driver cffi openssl

build-mac-openssl3:
name: Python ${{ matrix.python }} on macos-10.15 with OpenSSL 3.0
runs-on: macos-10.15
name: Python ${{ matrix.python }} on macos-11 with OpenSSL 3.0
runs-on: macos-11
strategy:
matrix:
python:
- '3.6'
- '3.10'
- '3.11'
steps:
- uses: actions/checkout@master
- uses: actions/setup-python@v2
Expand All @@ -171,10 +172,9 @@ jobs:
strategy:
matrix:
python:
- '2.7'
- '3.6'
- '3.9'
- '3.10'
- '3.11'
- 'pypy-3.7-v7.3.5'
steps:
- uses: actions/checkout@master
Expand Down Expand Up @@ -224,9 +224,8 @@ jobs:
strategy:
matrix:
python:
- '2.6'
- '3.2'
- '3.3'
- '3.6'
- '3.7'
steps:
- uses: actions/checkout@master
- name: Setup deadsnakes/ppa
Expand Down
2 changes: 1 addition & 1 deletion dev/pyenv-install.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ def run(version=None):
if sys.platform == 'win32':
raise ValueError('pyenv-install is not designed for Windows')

if version not in set(['2.6', '3.3']):
if version not in set(['2.6', '2.7', '3.3']):
raise ValueError('Invalid version: %r' % version)

python_path = os.path.expanduser('~/.pyenv/versions/%s/bin' % version)
Expand Down

0 comments on commit 133f770

Please sign in to comment.