Skip to content

Commit 4e5fbe8

Browse files
authored
[Infra] Update mlmodeldownloader workflow to use macOS 15 for Xcode 16 (#14066)
1 parent 0aca0bf commit 4e5fbe8

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

.github/workflows/mlmodeldownloader.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ jobs:
2222
strategy:
2323
matrix:
2424
target: [ios, tvos, macos, watchos]
25-
os: [macos-14]
26-
xcode: [Xcode_15.2, Xcode_16]
27-
runs-on: ${{ matrix.os }}
25+
build-env:
26+
- os: macos-14
27+
xcode: Xcode_15.2
28+
- os: macos-15
29+
xcode: Xcode_16.1
30+
runs-on: ${{ matrix.build-env.os }}
2831
steps:
2932
- uses: actions/checkout@v4
3033
- uses: ruby/setup-ruby@v1
@@ -38,7 +41,7 @@ jobs:
3841
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/MLModelDownloader/GoogleService-Info.plist.gpg \
3942
FirebaseMLModelDownloader/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret"
4043
- name: Xcode
41-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
44+
run: sudo xcode-select -s /Applications/${{ matrix.build-env.xcode }}.app/Contents/Developer
4245
- name: Build and test
4346
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMLModelDownloader.podspec --platforms=${{ matrix.target }})
4447

@@ -102,22 +105,22 @@ jobs:
102105
xcode: Xcode_15.4
103106
target: iOS
104107
- os: macos-15
105-
xcode: Xcode_16
108+
xcode: Xcode_16.1
106109
target: iOS
107110
- os: macos-15
108-
xcode: Xcode_16
111+
xcode: Xcode_16.1
109112
target: tvOS
110113
- os: macos-15
111-
xcode: Xcode_16
114+
xcode: Xcode_16.1
112115
target: macOS
113116
- os: macos-15
114-
xcode: Xcode_16
117+
xcode: Xcode_16.1
115118
target: watchOS
116119
- os: macos-15
117-
xcode: Xcode_16
120+
xcode: Xcode_16.1
118121
target: catalyst
119122
- os: macos-15
120-
xcode: Xcode_16
123+
xcode: Xcode_16.1
121124
target: visionOS
122125
runs-on: ${{ matrix.os }}
123126
steps:

0 commit comments

Comments
 (0)