Skip to content

Commit

Permalink
Use Cirrus M1 macOS runners for CI (pythonGH-119979)
Browse files Browse the repository at this point in the history
Co-authored-by: Ee Durbin <ee@python.org>
  • Loading branch information
ambv and ewdurbin authored Jun 3, 2024
1 parent 42a34dd commit 6acb32f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand All @@ -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'
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_pyrepl/test_unix_console.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion Lib/test/test_pyrepl/test_windows_console.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys
import unittest

if sys.platform != 'win32':
if sys.platform != "win32":
raise unittest.SkipTest("test only relevant on win32")


Expand Down

0 comments on commit 6acb32f

Please sign in to comment.