Skip to content

Commit

Permalink
Cherrypick darwin build fix due to github macos runner move to arm64 (p…
Browse files Browse the repository at this point in the history
…roject-chip#33173)

* Fix builds to macos-13 rather than latest due to bootstrap python incompatibilities (project-chip#33142)

* Add a few more conversions that did not happen in ToT but seem needed on 1.3
  • Loading branch information
andy31415 authored Apr 25, 2024
1 parent 7cdf4e8 commit 2416796
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ jobs:
build_darwin:
name: Build on Darwin (clang, python_lib, simulated)
runs-on: macos-latest
runs-on: macos-13
if: github.actor != 'restyled-io[bot]'

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
LSAN_OPTIONS: detect_leaks=1 malloc_context_size=40 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt

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

steps:
- name: Checkout
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
framework:
name: Build framework
if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
runs-on: macos-13
strategy:
matrix:
options: # We don't need a full matrix
Expand Down Expand Up @@ -68,7 +68,7 @@ jobs:
tests:
name: Run framework tests
if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
runs-on: macos-13
strategy:
matrix:
options: # We don't need a full matrix
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
tv-casting-bridge:
name: Build TV Casting Bridge example
if: github.actor != 'restyled-io[bot]'
runs-on: macos-latest
runs-on: macos-13
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -148,7 +148,7 @@ jobs:
darwin:
name: Build Darwin # Matches the previous monolithic build that's marked "required" for PRs
needs: [ framework, tests ]
runs-on: macos-latest
runs-on: macos-13
steps:
- name: Done
run: 'true' # nothing to do
2 changes: 1 addition & 1 deletion .github/workflows/fuzzing-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:

build_darwin_fuzzing:
name: Build on Darwin
runs-on: macos-latest
runs-on: macos-13
if: github.actor != 'restyled-io[bot]'

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ jobs:
LSAN_OPTIONS: detect_leaks=1 suppressions=scripts/tests/chiptest/lsan-mac-suppressions.txt

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

steps:
- name: Checkout
Expand Down Expand Up @@ -584,7 +584,7 @@ jobs:
TSAN_OPTIONS: "halt_on_error=1"

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

steps:
- name: Checkout
Expand Down

0 comments on commit 2416796

Please sign in to comment.