diff options
| author | Łukasz Langa <lukasz@langa.pl> | 2024-06-03 16:15:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-03 16:15:54 (GMT) |
| commit | 0480fd628a33351be868460c6febc09541ac722c (patch) | |
| tree | 62fbac05c2171a911b7d78c16b854c2d21709721 | |
| parent | 059be67b51717519609b29c53bf742ca4d91b68f (diff) | |
| download | cpython-0480fd628a33351be868460c6febc09541ac722c.zip cpython-0480fd628a33351be868460c6febc09541ac722c.tar.gz cpython-0480fd628a33351be868460c6febc09541ac722c.tar.bz2 | |
[3.12] Use Cirrus M1 macOS runners for CI (GH-119979) (GH-119987)
(cherry picked from commit 6acb32fac3511c1d5500cac66f1d6397dcdab835)
Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Co-authored-by: Ee Durbin <ee@python.org>
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/reusable-macos.yml | 8 | ||||
| -rw-r--r-- | Lib/asyncio/__main__.py | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cad8d46..18e3de3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -228,6 +228,8 @@ jobs: uses: ./.github/workflows/reusable-macos.yml with: config_hash: ${{ needs.check_source.outputs.config_hash }} + # Cirrus is M1, macos-13 is default GHA Intel + os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]' build_ubuntu: name: 'Ubuntu' diff --git a/.github/workflows/reusable-macos.yml b/.github/workflows/reusable-macos.yml index 6df27b1..fe16ad6 100644 --- a/.github/workflows/reusable-macos.yml +++ b/.github/workflows/reusable-macos.yml @@ -8,6 +8,9 @@ on: required: false type: boolean default: false + os-matrix: + required: false + type: string jobs: build_macos: @@ -22,10 +25,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ - "macos-14", # M1 - "macos-13", # Intel - ] + os: ${{fromJson(inputs.os-matrix)}} runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/Lib/asyncio/__main__.py b/Lib/asyncio/__main__.py index 18bb87a..c39a31d 100644 --- a/Lib/asyncio/__main__.py +++ b/Lib/asyncio/__main__.py @@ -16,7 +16,6 @@ class AsyncIOInteractiveConsole(code.InteractiveConsole): def __init__(self, locals, loop): super().__init__(locals) self.compile.compiler.flags |= ast.PyCF_ALLOW_TOP_LEVEL_AWAIT - self.loop = loop def runcode(self, code): |