Skip to content

Use Cirrus M1 macOS runners for CI #119979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 3, 2024
Merged

Use Cirrus M1 macOS runners for CI #119979

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
07eed1f
Use Cirrus M1 macOS runners for CI
ambv Jun 3, 2024
3791b8d
A spurious change to trigger source builds and tests
ambv Jun 3, 2024
5797b82
More spurious changes
ambv Jun 3, 2024
3fd7f9b
Only use Cirrus for the main macOS build
ambv Jun 3, 2024
29ca992
Revert "Only use Cirrus for the main macOS build"
ambv Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
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,7 +210,7 @@ jobs:
with:
config_hash: ${{ needs.check_source.outputs.config_hash }}
free-threading: true
# macos-14-large is Intel with 12 cores (most parallelism)
# macos-14 is default GHA Apple Silicon
os-matrix: '["macos-14"]'

build_ubuntu:
Expand Down
3 changes: 2 additions & 1 deletion Lib/test/test_pyrepl/test_unix_console.py
View file
Open in desktop
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
View file
Open in desktop
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