Skip to content

Commit d3e48c6

Browse files
authored
Cherrypick fix for macos-latest github actions move (#33172)
* 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.2 * Also fix construct dependency * Revert "Also fix construct dependency" This reverts commit 296be95.
1 parent b35ef93 commit d3e48c6

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.github/workflows/build.yaml

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

377377
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

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
name: Build Darwin
3333

3434
if: github.actor != 'restyled-io[bot]'
35-
runs-on: macos-latest
35+
runs-on: macos-13
3636

3737
steps:
3838
- name: Checkout

.github/workflows/fuzzing-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272

7373
build_darwin_fuzzing:
7474
name: Build on Darwin
75-
runs-on: macos-latest
75+
runs-on: macos-13
7676
if: github.actor != 'restyled-io[bot]'
7777

7878
steps:

.github/workflows/tests.yaml

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

301301
if: github.actor != 'restyled-io[bot]'
302-
runs-on: macos-latest
302+
runs-on: macos-13
303303

304304
steps:
305305
- name: Checkout
@@ -501,7 +501,7 @@ jobs:
501501
TSAN_OPTIONS: "halt_on_error=1"
502502

503503
if: github.actor != 'restyled-io[bot]' && false
504-
runs-on: macos-latest
504+
runs-on: macos-13
505505

506506
steps:
507507
- name: Checkout

0 commit comments

Comments
 (0)