Skip to content
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.

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

Cherrypick darwin build fix due to github macos runner move to arm64 #33173

Merged
merged 2 commits into from
Apr 25, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Add a few more conversions that did not happen in ToT but seem needed…
… on 1.3
andy31415 committed Apr 25, 2024
commit 219a02087db81005a28b2d17365712f005f48dcb
2 changes: 1 addition & 1 deletion .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions .github/workflows/darwin.yaml
Original file line number Diff line number Diff line change
@@ -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
@@ -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
@@ -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
@@ -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