Skip to content

[Infra] Update core workflows to use macOS 15 for Xcode 16 #14082

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 1 commit into from
Nov 11, 2024
+26 −20
Merged

[Infra] Update core workflows to use macOS 15 for Xcode 16 #14082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions .github/workflows/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,19 @@ jobs:
matrix:
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
target: [ios, tvos, macos --skip-tests, watchos]
os: [macos-14]
xcode: [Xcode_15.2, Xcode_16]
runs-on: ${{ matrix.os }}
build-env:
- os: macos-14
xcode: Xcode_15.2
- os: macos-15
xcode: Xcode_16.1
runs-on: ${{ matrix.build-env.os }}
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
- name: Build and test
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=${{ matrix.target }}

Expand Down Expand Up @@ -72,22 +75,22 @@ jobs:
xcode: Xcode_15.4
target: iOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: iOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: tvOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: macOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: watchOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: catalyst
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: visionOS
runs-on: ${{ matrix.os }}
steps:
Expand Down
23 changes: 13 additions & 10 deletions .github/workflows/core_internal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,19 @@ jobs:
strategy:
matrix:
target: [ios, tvos, macos, watchos]
os: [macos-14]
xcode: [Xcode_15.2, Xcode_16]
runs-on: ${{ matrix.os }}
build-env:
- os: macos-14
xcode: Xcode_15.2
- os: macos-15
xcode: Xcode_16.1
runs-on: ${{ matrix.build-env.os }}
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
- name: Build and test
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }}

Expand Down Expand Up @@ -68,22 +71,22 @@ jobs:
xcode: Xcode_15.4
target: iOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: iOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: tvOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: macOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: watchOS
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: catalyst
- os: macos-15
xcode: Xcode_16
xcode: Xcode_16.1
target: visionOS
runs-on: ${{ matrix.os }}
steps:
Expand Down
Loading