Skip to content

Commit 2416796

Browse files
authored
Cherrypick darwin build fix due to github macos runner move to arm64 (#33173)
* Fix builds to macos-13 rather than latest due to bootstrap python incompatibilities (#33142) * Add a few more conversions that did not happen in ToT but seem needed on 1.3
1 parent 7cdf4e8 commit 2416796

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

.github/workflows/build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -369,7 +369,7 @@ jobs:
369369
370370
build_darwin:
371371
name: Build on Darwin (clang, python_lib, simulated)
372-
runs-on: macos-latest
372+
runs-on: macos-13
373373
if: github.actor != 'restyled-io[bot]'
374374

375375
steps:

.github/workflows/darwin-tests.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
5050

5151
if: github.actor != 'restyled-io[bot]'
52-
runs-on: macos-latest
52+
runs-on: macos-13
5353

5454
steps:
5555
- name: Checkout

.github/workflows/darwin.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
framework:
3232
name: Build framework
3333
if: github.actor != 'restyled-io[bot]'
34-
runs-on: macos-latest
34+
runs-on: macos-13
3535
strategy:
3636
matrix:
3737
options: # We don't need a full matrix
@@ -68,7 +68,7 @@ jobs:
6868
tests:
6969
name: Run framework tests
7070
if: github.actor != 'restyled-io[bot]'
71-
runs-on: macos-latest
71+
runs-on: macos-13
7272
strategy:
7373
matrix:
7474
options: # We don't need a full matrix
@@ -131,7 +131,7 @@ jobs:
131131
tv-casting-bridge:
132132
name: Build TV Casting Bridge example
133133
if: github.actor != 'restyled-io[bot]'
134-
runs-on: macos-latest
134+
runs-on: macos-13
135135
steps:
136136
- name: Checkout
137137
uses: actions/checkout@v4
@@ -148,7 +148,7 @@ jobs:
148148
darwin:
149149
name: Build Darwin # Matches the previous monolithic build that's marked "required" for PRs
150150
needs: [ framework, tests ]
151-
runs-on: macos-latest
151+
runs-on: macos-13
152152
steps:
153153
- name: Done
154154
run: 'true' # nothing to do

.github/workflows/fuzzing-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868

6969
build_darwin_fuzzing:
7070
name: Build on Darwin
71-
runs-on: macos-latest
71+
runs-on: macos-13
7272
if: github.actor != 'restyled-io[bot]'
7373

7474
steps:

.github/workflows/tests.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ jobs:
328328
LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt
329329

330330
if: github.actor != 'restyled-io[bot]'
331-
runs-on: macos-latest
331+
runs-on: macos-13
332332

333333
steps:
334334
- name: Checkout
@@ -584,7 +584,7 @@ jobs:
584584
TSAN_OPTIONS: "halt_on_error=1"
585585

586586
if: github.actor != 'restyled-io[bot]' && false
587-
runs-on: macos-latest
587+
runs-on: macos-13
588588

589589
steps:
590590
- name: Checkout

0 commit comments

Comments
 (0)