Skip to content

Commit 00dc8f7

Browse files
ambvewdurbin
authored andcommitted
Use Cirrus M1 macOS runners for CI (pythonGH-119979)
Co-authored-by: Ee Durbin <[email protected]>
1 parent 57f461d commit 00dc8f7

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,8 @@ jobs:
199199
uses: ./.github/workflows/reusable-macos.yml
200200
with:
201201
config_hash: ${{ needs.check_source.outputs.config_hash }}
202-
# macos-14 is M1, macos-13 is Intel
203-
os-matrix: '["macos-14", "macos-13"]'
202+
# Cirrus is M1, macos-13 is default GHA Intel
203+
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma", "macos-13"]'
204204

205205
build_macos_free_threading:
206206
name: 'macOS (free-threading)'
@@ -210,8 +210,8 @@ jobs:
210210
with:
211211
config_hash: ${{ needs.check_source.outputs.config_hash }}
212212
free-threading: true
213-
# macos-14-large is Intel with 12 cores (most parallelism)
214-
os-matrix: '["macos-14"]'
213+
# Cirrus is M1
214+
os-matrix: '["ghcr.io/cirruslabs/macos-runner:sonoma"]'
215215

216216
build_ubuntu:
217217
name: 'Ubuntu'

Lib/test/test_pyrepl/test_unix_console.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
from unittest.mock import MagicMock, call, patch, ANY
77

88
from .support import handle_all_events, code_to_events
9+
910
try:
1011
from _pyrepl.console import Event
1112
from _pyrepl.unix_console import UnixConsole
1213
except ImportError:
1314
pass
1415

16+
1517
def unix_console(events, **kwargs):
1618
console = UnixConsole()
1719
console.get_event = MagicMock(side_effect=events)
@@ -138,7 +140,6 @@ def test_wrap(self, _os_write):
138140
_os_write.assert_any_call(ANY, b"4")
139141
con.restore()
140142

141-
142143
def test_cursor_left(self, _os_write):
143144
code = "1"
144145
events = itertools.chain(

Lib/test/test_pyrepl/test_windows_console.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import sys
22
import unittest
33

4-
if sys.platform != 'win32':
4+
if sys.platform != "win32":
55
raise unittest.SkipTest("test only relevant on win32")
66

77

0 commit comments

Comments
 (0)