From 07eed1fb414ac4ca2a2f62fa71358b93bfc1cbe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Mon, 3 Jun 2024 15:22:16 +0200
Subject: [PATCH 1/5] Use Cirrus M1 macOS runners for CI

---
 .github/workflows/build.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7e63737b90b72a..cde93c77a0b82e 100644
--- 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'

From 3791b8dd8fc0ecfa9a256402f0512932b474d0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Mon, 3 Jun 2024 15:23:47 +0200
Subject: [PATCH 2/5] A spurious change to trigger source builds and tests

---
 Lib/test/test_pyrepl/test_windows_console.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lib/test/test_pyrepl/test_windows_console.py b/Lib/test/test_pyrepl/test_windows_console.py
index e52a54d31fb5d8..4a3b2baf64a944 100644
--- 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")
 
 

From 5797b82249b7b75bb0dbced4c4097fa4fc4b82e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Mon, 3 Jun 2024 15:42:29 +0200
Subject: [PATCH 3/5] More spurious changes

---
 Lib/test/test_pyrepl/test_unix_console.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lib/test/test_pyrepl/test_unix_console.py b/Lib/test/test_pyrepl/test_unix_console.py
index d0b98f17ade094..e3bbabcb0089fb 100644
--- a/Lib/test/test_pyrepl/test_unix_console.py
+++ b/Lib/test/test_pyrepl/test_unix_console.py
@@ -6,12 +6,14 @@
 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 @@ def test_wrap(self, _os_write):
         _os_write.assert_any_call(ANY, b"4")
         con.restore()
 
-
     def test_cursor_left(self, _os_write):
         code = "1"
         events = itertools.chain(

From 3fd7f9bd698daeeec95f5f08320c9b6e6da9324d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Mon, 3 Jun 2024 16:07:55 +0200
Subject: [PATCH 4/5] Only use Cirrus for the main macOS build

---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cde93c77a0b82e..1327a6c7bf9580 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -210,8 +210,8 @@ jobs:
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
       free-threading: true
-      # Cirrus is M1
-      os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma"]'
+      # macos-14 is default GHA Apple Silicon
+      os-matrix: '["macos-14"]'
 
   build_ubuntu:
     name: 'Ubuntu'

From 29ca9924bd82800f203738238b400ff39da0faa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Langa?= <lukasz@langa.pl>
Date: Mon, 3 Jun 2024 16:51:30 +0200
Subject: [PATCH 5/5] Revert "Only use Cirrus for the main macOS build"

This reverts commit 3fd7f9bd698daeeec95f5f08320c9b6e6da9324d.
---
 .github/workflows/build.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1327a6c7bf9580..cde93c77a0b82e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -210,8 +210,8 @@ jobs:
     with:
       config_hash: ${{ needs.check_source.outputs.config_hash }}
       free-threading: true
-      # macos-14 is default GHA Apple Silicon
-      os-matrix: '["macos-14"]'
+      # Cirrus is M1
+      os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma"]'
 
   build_ubuntu:
     name: 'Ubuntu'