From 4b1cd45175a9632dd2c0f6ce23d69bc5f8cf2db8 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 11:55:06 -0400 Subject: [PATCH 1/9] switch ci to macos arm --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e449161..bb75884 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,7 +76,7 @@ jobs: runs-on: windows-latest python_platform: win32 - name: 🍎 - runs-on: macos-12 + runs-on: macos-latest python_platform: darwin python: - name: CPython 2.7 From 0e314e917e51d2a3373c80ac2e84f1cf49768545 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 11:59:04 -0400 Subject: [PATCH 2/9] Update ci.yml --- .github/workflows/ci.yml | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb75884..ffed6e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -56,7 +56,9 @@ jobs: matrix: os: - name: 🐧 - runs-on: ubuntu-latest + matrix: linux + runs-on: + - intel: ubuntu-latest python_platform: linux container: "2.7": docker://python:2.7-buster @@ -73,11 +75,21 @@ jobs: "pypy3.9": docker://pypy:3.9-bookworm "pypy3.10": docker://pypy:3.10-bookworm - name: 🪟 - runs-on: windows-latest + matrix: windows + runs-on: + - intel: windows-latest python_platform: win32 - name: 🍎 - runs-on: macos-latest + matrix: macos + runs-on: + - intel: macos-13 + - arm: macos-latest python_platform: darwin + arch: + - name: ARM + matrix: arm + - name: Intel + matrix: intel python: - name: CPython 2.7 tox: py27 @@ -209,6 +221,18 @@ jobs: implementation: pypy reactor: tox: pyside2 + - os: + matrix: linux + arch: + matrix: arm + - os: + matrix: windows + arch: + matrix: arm + - os: + matrix: macos + arch: + matrix: arm steps: - uses: actions/checkout@v4 - name: Enable Problem Matchers From 1e619b9bf14e7017e828e8d3cae1e514b3b1b438 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 12:30:59 -0400 Subject: [PATCH 3/9] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ffed6e3..6f97f28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,7 +49,7 @@ jobs: test: name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }} needs: build - runs-on: ${{ matrix.os.runs-on }} + runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }} container: ${{ matrix.os.container[matrix.python.docker] }} strategy: fail-fast: false From 03755b4eac040b3c6cb874ee33e7301488c26193 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 12:38:05 -0400 Subject: [PATCH 4/9] Update ci.yml --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f97f28..7105ec4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -82,8 +82,8 @@ jobs: - name: 🍎 matrix: macos runs-on: - - intel: macos-13 - arm: macos-latest + - intel: macos-13 python_platform: darwin arch: - name: ARM @@ -229,10 +229,6 @@ jobs: matrix: windows arch: matrix: arm - - os: - matrix: macos - arch: - matrix: arm steps: - uses: actions/checkout@v4 - name: Enable Problem Matchers From f5de7582bd3127581e62b3e32a3d47a621c819b7 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 12:43:18 -0400 Subject: [PATCH 5/9] Update ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7105ec4..6ac74ce 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -58,7 +58,7 @@ jobs: - name: 🐧 matrix: linux runs-on: - - intel: ubuntu-latest + intel: ubuntu-latest python_platform: linux container: "2.7": docker://python:2.7-buster @@ -77,13 +77,13 @@ jobs: - name: 🪟 matrix: windows runs-on: - - intel: windows-latest + intel: windows-latest python_platform: win32 - name: 🍎 matrix: macos runs-on: - - arm: macos-latest - - intel: macos-13 + arm: macos-latest + intel: macos-13 python_platform: darwin arch: - name: ARM From ec2e24c053be1b6edd92867f2367576a746dc30b Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 15:56:15 -0400 Subject: [PATCH 6/9] Update ci.yml --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ac74ce..b409301 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,7 @@ jobs: if-no-files-found: error test: - name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }} + name: ${{ matrix.os.name }} ${{ matrix.python.name }} ${{ matrix.reactor.name }} ${{ matrix.arch.name }} needs: build runs-on: ${{ matrix.os.runs-on[matrix.arch.matrix] }} container: ${{ matrix.os.container[matrix.python.docker] }} @@ -85,11 +85,6 @@ jobs: arm: macos-latest intel: macos-13 python_platform: darwin - arch: - - name: ARM - matrix: arm - - name: Intel - matrix: intel python: - name: CPython 2.7 tox: py27 @@ -184,6 +179,11 @@ jobs: - name: asyncio tox: asyncio dependencies: asyncio + arch: + - name: ARM + matrix: arm + - name: Intel + matrix: intel exclude: - python: major: 2 From d9a9151b461bf773054b593a5c6bdb0612ae5ed2 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 16:09:12 -0400 Subject: [PATCH 7/9] Update ci.yml --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b409301..0adec78 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -182,8 +182,12 @@ jobs: arch: - name: ARM matrix: arm + setup-python: + architecture: "" - name: Intel matrix: intel + setup-python: + architecture: x64 exclude: - python: major: 2 @@ -247,7 +251,7 @@ jobs: # CPython -> 3.9.0-alpha - 3.9.X # PyPy -> pypy-3.7 python-version: ${{ fromJSON(format('["{0}", "{1}"]', format('{0}.0-alpha - {0}.X', matrix.python.action), matrix.python.action))[startsWith(matrix.python.action, 'pypy')] }} - architecture: x64 + architecture: ${{ matrix.arch.setup-python.architecture }} - name: Report Python information shell: bash run: | From 56e5e1ef6396454bcbc6e8341e4d0223ed06c895 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Tue, 15 Oct 2024 16:27:19 -0400 Subject: [PATCH 8/9] Update ci.yml --- .github/workflows/ci.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0adec78..2985f09 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -183,7 +183,7 @@ jobs: - name: ARM matrix: arm setup-python: - architecture: "" + architecture: arm64 - name: Intel matrix: intel setup-python: @@ -233,6 +233,21 @@ jobs: matrix: windows arch: matrix: arm + - os: + matrix: macos + python: + action: "3.7" + arch: + matrix: arm + - arch: + matrix: arm + reactor: + tox: pyside2 + - python: + action: "3.7" + implementation: pypy + arch: + matrix: arm steps: - uses: actions/checkout@v4 - name: Enable Problem Matchers From cb2da66754ec85d53dc78ee943342082175bdb24 Mon Sep 17 00:00:00 2001 From: Kyle Altendorf Date: Wed, 16 Oct 2024 08:18:28 -0400 Subject: [PATCH 9/9] Update ci.yml --- .github/workflows/ci.yml | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2985f09..6b6f306 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,48 +88,56 @@ jobs: python: - name: CPython 2.7 tox: py27 + major-dot-minor: 2.7 action: 2.7 docker: 2.7 implementation: cpython major: 2 - name: CPython 3.6 tox: py36 + major-dot-minor: 3.6 action: 3.6 docker: 3.6 implementation: cpython major: 3 - name: CPython 3.7 tox: py37 + major-dot-minor: 3.7 action: 3.7 docker: 3.7 implementation: cpython major: 3 - name: CPython 3.8 tox: py38 + major-dot-minor: 3.8 action: 3.8 docker: 3.8 implementation: cpython major: 3 - name: CPython 3.9 tox: py39 + major-dot-minor: 3.9 action: 3.9 docker: 3.9 implementation: cpython major: 3 - name: CPython 3.10 tox: py310 + major-dot-minor: "3.10" action: "3.10" docker: "3.10" implementation: cpython major: 3 - name: CPython 3.11 tox: py311 + major-dot-minor: "3.11" action: "3.11" docker: "3.11" implementation: cpython major: 3 - name: CPython 3.12 tox: py312 + major-dot-minor: "3.12" action: "3.12" docker: "3.12" implementation: cpython @@ -144,24 +152,28 @@ jobs: # major: 2 - name: PyPy 3.7 tox: pypy37 + major-dot-minor: 3.7 action: pypy-3.7 docker: pypy3.7 implementation: pypy major: 3 - name: PyPy 3.8 tox: pypy38 + major-dot-minor: 3.8 action: pypy-3.8 docker: pypy3.8 implementation: pypy major: 3 - name: PyPy 3.9 tox: pypy39 + major-dot-minor: 3.9 action: pypy-3.9 docker: pypy3.9 implementation: pypy major: 3 - name: PyPy 3.10 tox: pypy310 + major-dot-minor: "3.10" action: pypy-3.10 docker: pypy3.10 implementation: pypy @@ -206,11 +218,11 @@ jobs: reactor: tox: pyside2 - python: - action: "3.11" + major-dot-minor: "3.11" reactor: tox: pyside2 - python: - action: "3.12" + major-dot-minor: "3.12" reactor: tox: pyside2 - python: @@ -236,18 +248,19 @@ jobs: - os: matrix: macos python: - action: "3.7" + major-dot-minor: "3.6" + arch: + matrix: arm + - os: + matrix: macos + python: + major-dot-minor: "3.7" arch: matrix: arm - arch: matrix: arm reactor: tox: pyside2 - - python: - action: "3.7" - implementation: pypy - arch: - matrix: arm steps: - uses: actions/checkout@v4 - name: Enable Problem Matchers