[3.13] Use Cirrus M1 macOS runners for CI (GH-119979) (GH-119986)

(cherry picked from commit 6acb32fac3511c1d5500cac66f1d6397dcdab835)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Co-authored-by: Ee Durbin <ee@python.org>

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d14d17a5e088b6eee09a9edc55c7dbac8327d19b..57c58d7ff1d6d840870a04b550f87a68a99ee815 100644 (file)
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -199,8 +199,8 @@ jobs:
     uses: ./.github/workflows/reusable-macos.yml
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
-      # macos-14 is M1, macos-13 is Intel
-      os-matrix: '["macos-14", "macos-13"]'
+      # Cirrus is M1, macos-13 is default GHA Intel
+      os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]'
 
   build_macos_free_threading:
     name: 'macOS (free-threading)'
@@ -210,8 +210,8 @@ jobs:
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
       free-threading: true
-      # macos-14-large is Intel with 12 cores (most parallelism)
-      os-matrix: '["macos-14"]'
+      # Cirrus is M1
+      os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma"]'
 
   build_ubuntu:
     name: 'Ubuntu'

diff --git a/Lib/test/test_pyrepl/test_unix_console.py b/Lib/test/test_pyrepl/test_unix_console.py
index d0b98f17ade094b5f05586f7ddecae0624ca270f..e3bbabcb0089fb233290380392fb9cd62393e414 100644 (file)
--- a/Lib/test/test_pyrepl/test_unix_console.py
+++ b/Lib/test/test_pyrepl/test_unix_console.py
@@ -6,12 +6,14 @@ from unittest import TestCase
 from unittest.mock import MagicMock, call, patch, ANY
 
 from .support import handle_all_events, code_to_events
+
 try:
     from _pyrepl.console import Event
     from _pyrepl.unix_console import UnixConsole
 except ImportError:
     pass
 
+
 def unix_console(events, **kwargs):
     console = UnixConsole()
     console.get_event = MagicMock(side_effect=events)
@@ -138,7 +140,6 @@ class TestConsole(TestCase):
         _os_write.assert_any_call(ANY, b"4")
         con.restore()
 
-
     def test_cursor_left(self, _os_write):
         code = "1"
         events = itertools.chain(

diff --git a/Lib/test/test_pyrepl/test_windows_console.py b/Lib/test/test_pyrepl/test_windows_console.py
index e52a54d31fb5d883c19bff2f49cabd69b6bd6283..4a3b2baf64a944377f55951ae6ea79965dc8d65f 100644 (file)
--- a/Lib/test/test_pyrepl/test_windows_console.py
+++ b/Lib/test/test_pyrepl/test_windows_console.py
@@ -1,7 +1,7 @@
 import sys
 import unittest
 
-if sys.platform != 'win32':
+if sys.platform != "win32":
     raise unittest.SkipTest("test only relevant on win32")