Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 06:01:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use Cirrus M1 macOS runners for CI (GH-119979)

Browse source 
Co-authored-by: Ee Durbin <ee@python.org>
This commit is contained in:
Łukasz Langa 2024-06-03 11:32:40 -04:00 • committed by GitHub
parent 42a34ddb0b
commit 6acb32fac3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.github/workflows/build.yml vendored
View file

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

3
Lib/test/test_pyrepl/test_unix_console.py
View file

@ -6,12 +6,14 @@
from unittest.mock import MagicMock, call, patch, ANY from unittest.mock import MagicMock, call, patch, ANY
from .support import handle_all_events, code_to_events from .support import handle_all_events, code_to_events
try: try:
from _pyrepl.console import Event from _pyrepl.console import Event
from _pyrepl.unix_console import UnixConsole from _pyrepl.unix_console import UnixConsole
except ImportError: except ImportError:
pass pass
def unix_console(events, **kwargs): def unix_console(events, **kwargs):
console = UnixConsole() console = UnixConsole()
console.get_event = MagicMock(side_effect=events) 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") _os_write.assert_any_call(ANY, b"4")
con.restore() con.restore()
def test_cursor_left(self, _os_write): def test_cursor_left(self, _os_write):
code = "1" code = "1"
events = itertools.chain( events = itertools.chain(

2
Lib/test/test_pyrepl/test_windows_console.py
View file

@ -1,7 +1,7 @@
import sys import sys
import unittest import unittest
if sys.platform != 'win32': if sys.platform != "win32":
raise unittest.SkipTest("test only relevant on win32") raise unittest.SkipTest("test only relevant on win32")