mirror of
https://github.com/python/cpython.git
synced 2025-08-11 04:19:06 +00:00
[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:
parent
059be67b51
commit
0480fd628a
3 changed files with 6 additions and 5 deletions
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -228,6 +228,8 @@ jobs:
|
||||||
uses: ./.github/workflows/reusable-macos.yml
|
uses: ./.github/workflows/reusable-macos.yml
|
||||||
with:
|
with:
|
||||||
config_hash: ${{ needs.check_source.outputs.config_hash }}
|
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:
|
build_ubuntu:
|
||||||
name: 'Ubuntu'
|
name: 'Ubuntu'
|
||||||
|
|
8
.github/workflows/reusable-macos.yml
vendored
8
.github/workflows/reusable-macos.yml
vendored
|
@ -8,6 +8,9 @@ on:
|
||||||
required: false
|
required: false
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
|
os-matrix:
|
||||||
|
required: false
|
||||||
|
type: string
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build_macos:
|
build_macos:
|
||||||
|
@ -22,10 +25,7 @@ jobs:
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
os: [
|
os: ${{fromJson(inputs.os-matrix)}}
|
||||||
"macos-14", # M1
|
|
||||||
"macos-13", # Intel
|
|
||||||
]
|
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
|
@ -16,7 +16,6 @@ class AsyncIOInteractiveConsole(code.InteractiveConsole):
|
||||||
def __init__(self, locals, loop):
|
def __init__(self, locals, loop):
|
||||||
super().__init__(locals)
|
super().__init__(locals)
|
||||||
self.compile.compiler.flags |= ast.PyCF_ALLOW_TOP_LEVEL_AWAIT
|
self.compile.compiler.flags |= ast.PyCF_ALLOW_TOP_LEVEL_AWAIT
|
||||||
|
|
||||||
self.loop = loop
|
self.loop = loop
|
||||||
|
|
||||||
def runcode(self, code):
|
def runcode(self, code):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue