Skip to content

[Infra] Move 'mlmodeldownloader' workflow to Xcode 16 #14692

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

Merged
merged 1 commit into from
Apr 9, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
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
17 changes: 10 additions & 7 deletions .github/workflows/mlmodeldownloader.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,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 All @@ -48,7 +48,7 @@ jobs:

mlmodeldownloader-cron-only:
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
runs-on: macos-14
runs-on: macos-15
env:
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
strategy:
Expand All @@ -58,6 +58,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: Configure test keychain
Expand All @@ -78,6 +80,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 @@ -99,11 +103,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 @@ -161,13 +162,15 @@ jobs:
if: github.repository == 'Firebase/firebase-ios-sdk' && (github.event_name == 'schedule' || github.event_name == 'pull_request')
env:
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
runs-on: macos-14
runs-on: macos-15
steps:
- uses: actions/checkout@v4
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
with:
cache_key: build-test${{ matrix.os }}
- 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: Install GoogleService-Info.plist
Expand Down
2 changes: 1 addition & 1 deletion FirebaseMLModelDownloader/Sources/DeviceLogger.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import Foundation

@_implementationOnly import FirebaseCoreExtension
internal import FirebaseCoreExtension

/// Enum of log messages.
enum LoggerMessageCode: Int {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

import Foundation
#if SWIFT_PACKAGE
@_implementationOnly import GoogleUtilities_UserDefaults
internal import GoogleUtilities_UserDefaults
#else
@_implementationOnly import GoogleUtilities
internal import GoogleUtilities
#endif // SWIFT_PACKAGE

/// Protocol to save or delete model info in user defaults.
Expand Down
4 changes: 2 additions & 2 deletions FirebaseMLModelDownloader/Sources/LocalModelInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

import Foundation
#if SWIFT_PACKAGE
@_implementationOnly import GoogleUtilities_UserDefaults
internal import GoogleUtilities_UserDefaults
#else
@_implementationOnly import GoogleUtilities
internal import GoogleUtilities
#endif // SWIFT_PACKAGE

/// Model info object with details about downloaded and locally available model.
Expand Down
4 changes: 2 additions & 2 deletions FirebaseMLModelDownloader/Sources/ModelDownloadTask.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

import Foundation
#if SWIFT_PACKAGE
@_implementationOnly import GoogleUtilities_UserDefaults
internal import GoogleUtilities_UserDefaults
#else
@_implementationOnly import GoogleUtilities
internal import GoogleUtilities
#endif // SWIFT_PACKAGE

/// Task to download model file to device.
Expand Down
4 changes: 2 additions & 2 deletions FirebaseMLModelDownloader/Sources/ModelDownloader.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import FirebaseCore
import FirebaseInstallations
import Foundation
#if SWIFT_PACKAGE
@_implementationOnly import GoogleUtilities_UserDefaults
internal import GoogleUtilities_UserDefaults
#else
@_implementationOnly import GoogleUtilities
internal import GoogleUtilities
#endif // SWIFT_PACKAGE

/// Possible ways to get a custom model.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
@testable import FirebaseMLModelDownloader
import XCTest
#if SWIFT_PACKAGE
@_implementationOnly import GoogleUtilities_UserDefaults
internal import GoogleUtilities_UserDefaults
#else
@_implementationOnly import GoogleUtilities
internal import GoogleUtilities
#endif // SWIFT_PACKAGE

extension GULUserDefaults {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
@testable import FirebaseMLModelDownloader
import XCTest
#if SWIFT_PACKAGE
@_implementationOnly import GoogleUtilities_UserDefaults
internal import GoogleUtilities_UserDefaults
#else
@_implementationOnly import GoogleUtilities
internal import GoogleUtilities
#endif // SWIFT_PACKAGE

/// Mock options to configure default Firebase app.
Expand Down
Loading