diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml index b9ef1ed5..46d46dbf 100644 --- a/.github/workflows/e2e-cache.yml +++ b/.github/workflows/e2e-cache.yml @@ -20,8 +20,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13] python-version: ['3.9', 'pypy-3.7-v7.x'] + exclude: + - os: macos-13 + python-version: 'pypy-3.7-v7.x' steps: - uses: actions/checkout@v4 - name: Setup Python @@ -96,8 +99,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13] python-version: ['3.9', 'pypy-3.7-v7.x'] + exclude: + - os: macos-13 + python-version: 'pypy-3.7-v7.x' steps: - uses: actions/checkout@v4 - name: Setup Python diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 2d5fb55d..db09724f 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -21,13 +21,6 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Run with setup-python 3.5 - uses: ./ - with: - python-version: 3.5 - - name: Verify 3.5 - run: python __tests__/verify-python.py 3.5 - - name: Run with setup-python 3.6 uses: ./ with: diff --git a/.github/workflows/test-pypy.yml b/.github/workflows/test-pypy.yml index f4cf8e61..d68f643c 100644 --- a/.github/workflows/test-pypy.yml +++ b/.github/workflows/test-pypy.yml @@ -19,7 +19,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-latest] pypy: - 'pypy-2.7' - 'pypy-3.7' @@ -32,6 +32,9 @@ jobs: - 'pypy-2.7-v7.3.4rc1' - 'pypy-3.7-nightly' - 'pypy3.8-v7.3.7' + exclude: + - os: macos-13 + pypy: 'pypy-3.7-nightly' steps: - name: Checkout @@ -73,7 +76,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-latest] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-latest] pypy: ['pypy2.7', 'pypy3.7', 'pypy3.8', 'pypy3.9-nightly'] steps: @@ -98,7 +101,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13] steps: - uses: actions/checkout@v4 - name: Setup PyPy and check latest @@ -131,7 +134,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13] steps: - uses: actions/checkout@v4 - name: Setup PyPy and check latest diff --git a/.github/workflows/test-python.yml b/.github/workflows/test-python.yml index 5982a897..a478d5c2 100644 --- a/.github/workflows/test-python.yml +++ b/.github/workflows/test-python.yml @@ -20,11 +20,9 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04] - python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04] + python: [3.6.7, 3.7.5, 3.8.15, 3.9.13] exclude: - - os: ubuntu-22.04 - python: 3.5.4 - os: ubuntu-22.04 python: 3.6.7 - os: ubuntu-22.04 @@ -64,11 +62,9 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04] - python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04] + python: [3.6.7, 3.7.5, 3.8.15, 3.9.13] exclude: - - os: ubuntu-22.04 - python: 3.5.4 - os: ubuntu-22.04 python: 3.6.7 - os: ubuntu-22.04 @@ -111,11 +107,9 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04] - python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04] + python: [3.6.7, 3.7.5, 3.8.15, 3.9.13] exclude: - - os: ubuntu-22.04 - python: 3.5.4 - os: ubuntu-22.04 python: 3.6.7 - os: ubuntu-22.04 @@ -156,11 +150,9 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04] - python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13, '==3.10.10'] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04] + python: [3.6.7, 3.7.5, 3.8.15, 3.9.13, '==3.10.10'] exclude: - - os: ubuntu-22.04 - python: 3.5.4 - os: ubuntu-22.04 python: 3.6.7 - os: ubuntu-22.04 @@ -206,11 +198,9 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04] - python: [3.5.4, 3.6.7, 3.7.5, 3.8.15, 3.9.13] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04] + python: [3.6.7, 3.7.5, 3.8.15, 3.9.13] exclude: - - os: ubuntu-22.04 - python: 3.5.4 - os: ubuntu-22.04 python: 3.6.7 - os: ubuntu-22.04 @@ -256,7 +246,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04] + os: [macos-13, windows-latest, ubuntu-20.04] steps: - name: Checkout uses: actions/checkout@v4 @@ -347,7 +337,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest, windows-latest, ubuntu-20.04, ubuntu-22.04] + os: [macos-13, windows-latest, ubuntu-20.04, ubuntu-22.04] python: ['3.7', '3.8', '3.9', '3.10'] steps: - name: Checkout @@ -395,7 +385,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, windows-latest, macos-latest] + os: [ubuntu-latest, windows-latest, macos-13] steps: - uses: actions/checkout@v4 - name: Setup Python and check latest