Skip to content

[Infra] Move 'core' workflow to Xcode 16 #14688

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 2 commits into from
Apr 9, 2025
Merged

[Infra] Move 'core' workflow to Xcode 16 #14688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e516543
[Infra] Move 'core' workflow to Xcode 16
ncooke3 Apr 9, 2025
ccbeaff
migrate core and coreextension
ncooke3 Apr 9, 2025
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
13 changes: 7 additions & 6 deletions .github/workflows/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
target: [ios, tvos, macos --skip-tests, watchos]
build-env:
- os: macos-14
xcode: Xcode_15.2
xcode: Xcode_16.2
- os: macos-15
xcode: Xcode_16.2
runs-on: ${{ matrix.build-env.os }}
Expand All @@ -46,6 +46,8 @@ jobs:
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
steps:
- uses: actions/checkout@v4
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
- name: Generate Swift Package.resolved
id: swift_package_resolve
run: |
Expand All @@ -68,11 +70,8 @@ jobs:
strategy:
matrix:
include:
- os: macos-13
xcode: Xcode_15.2
target: iOS
- os: macos-14
xcode: Xcode_15.4
xcode: Xcode_16.2
target: iOS
- os: macos-15
xcode: Xcode_16.2
Expand Down Expand Up @@ -131,7 +130,7 @@ jobs:
# Don't run on private repo.
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'

runs-on: macos-13
runs-on: macos-14
strategy:
matrix:
target: [ios, tvos, macos]
Expand All @@ -142,6 +141,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: PodLibLint Core Cron
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/core_extension.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
target: [ios, tvos, macos, watchos]
build-env:
- os: macos-14
xcode: Xcode_15.2
xcode: Xcode_16.2
- os: macos-15
xcode: Xcode_16.2
runs-on: ${{ matrix.build-env.os }}
Expand Down Expand Up @@ -50,6 +50,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: PodLibLint CoreInternal Cron
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/core_internal.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
target: [ios, tvos, macos, watchos]
build-env:
- os: macos-14
xcode: Xcode_15.2
xcode: Xcode_16.2
swift_version: 5.9
- os: macos-15
xcode: Xcode_16.2
Expand Down Expand Up @@ -49,6 +49,8 @@ jobs:
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
steps:
- uses: actions/checkout@v4
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
- name: Generate Swift Package.resolved
id: swift_package_resolve
run: |
Expand All @@ -71,11 +73,8 @@ jobs:
strategy:
matrix:
include:
- os: macos-13
xcode: Xcode_15.2
target: iOS
- os: macos-14
xcode: Xcode_15.4
xcode: Xcode_16.2
target: iOS
- os: macos-15
xcode: Xcode_16.2
Expand Down Expand Up @@ -134,7 +133,7 @@ jobs:
core-internal-cron-only:
# Don't run on private repo.
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
runs-on: macos-14
runs-on: macos-15
strategy:
matrix:
target: [ios, tvos, macos]
Expand All @@ -145,6 +144,8 @@ jobs:
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
- name: Xcode
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
- name: Setup Bundler
run: scripts/setup_bundler.sh
- name: PodLibLint CoreInternal Cron
Expand Down
4 changes: 2 additions & 2 deletions FirebaseCore/Internal/Sources/HeartbeatLogging/HeartbeatsPayload.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
import Foundation

#if SWIFT_PACKAGE
@_implementationOnly import GoogleUtilities_NSData
internal import GoogleUtilities_NSData
#else
@_implementationOnly import GoogleUtilities
internal import GoogleUtilities
#endif // SWIFT_PACKAGE

/// A type that provides a string representation for use in an HTTP header.
Expand Down
Loading