[3.12] Use Cirrus M1 macOS runners for CI (GH-119979) (GH-119987)

(cherry picked from commit 6acb32fac3)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Co-authored-by: Ee Durbin <ee@python.org>
This commit is contained in:
Łukasz Langa 2024-06-03 12:15:54 -04:00 committed by GitHub
parent 059be67b51
commit 0480fd628a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions

View file

@ -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'

View file

@ -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

View file

@ -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):