https://github.com/python/cpython/commit/0480fd628a33351be868460c6febc09541ac722c
commit: 0480fd628a33351be868460c6febc09541ac722c
branch: 3.12
author: Łukasz Langa <luk...@langa.pl>
committer: ambv <luk...@langa.pl>
date: 2024-06-03T18:15:54+02:00
summary:
[3.12] Use Cirrus M1 macOS runners for CI (GH-119979) (GH-119987)
(cherry picked from commit 6acb32fac3511c1d5500cac66f1d6397dcdab835)
Co-authored-by: Łukasz Langa <luk...@langa.pl>
Co-authored-by: Ee Durbin <e...@python.org>
files:
M .github/workflows/build.yml
M .github/workflows/reusable-macos.yml
M Lib/asyncio/__main__.py
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cad8d4646d5587..18e3de3d8ebd6f 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 6df27b172a9729..fe16ad6d4b6e40 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 18bb87a5bc4ffd..c39a31d7b3df5b 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):
_______________________________________________
Python-checkins mailing list -- python-checkins@python.org
To unsubscribe send an email to python-checkins-le...@python.org
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: arch...@mail-archive.com
