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

(cherry picked from commit 6acb32fac3)

Co-authored-by: Łukasz Langa <lukasz@langa.pl>
Co-authored-by: Ee Durbin <ee@python.org>
This commit is contained in:
Miss Islington (bot) 2024-06-03 18:15:37 +02:00 committed by GitHub
parent 671b740f45
commit 060d846f43
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 6 deletions

View File

@ -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'

View File

@ -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(

View File

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