Skip to content

Commit a309e70

Browse files
andrewheardandrewheard
committed
Merge branch 'main' into ah/vertex-schema-items
# Conflicts: # FirebaseVertexAI/CHANGELOG.md
2 parents 56c5b0e + a1c38ed commit a309e70

File tree

103 files changed

+699
-345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+699
-345
lines changed

‎.github/workflows/abtesting.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: abtesting
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths:
67
- 'FirebaseABTesting**'
@@ -137,7 +138,7 @@ jobs:
137138
# Don't run on private repo unless it is a PR.
138139
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
139140

140-
runs-on: macos-14
141+
runs-on: macos-15
141142
steps:
142143
- uses: actions/checkout@v4
143144
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -146,6 +147,8 @@ jobs:
146147
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
147148
- name: Setup Bundler
148149
run: scripts/setup_bundler.sh
150+
- name: Xcode
151+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
149152
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
150153
with:
151154
timeout_minutes: 120

‎.github/workflows/analytics.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: analytics
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths:
67
- 'FirebaseAnalytics**'
@@ -23,12 +24,12 @@ jobs:
2324
strategy:
2425
matrix:
2526
target: [ios, tvos, macos]
26-
os: [macos-14, macos-13]
27+
os: [macos-14, macos-15]
2728
include:
2829
- os: macos-14
29-
xcode: Xcode_15.3
30-
- os: macos-13
31-
xcode: Xcode_15.2
30+
xcode: Xcode_16.2
31+
- os: macos-15
32+
xcode: Xcode_16.3
3233
runs-on: ${{ matrix.os }}
3334

3435
steps:

‎.github/workflows/api_diff_report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: API Diff Report
22

3-
on: [pull_request]
3+
on: [pull_request, workflow_dispatch]
44

55
concurrency:
66
group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}

‎.github/workflows/appdistribution.yml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: appdistribution
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths:
67
- 'FirebaseAppDistribution**'
@@ -22,12 +23,10 @@ jobs:
2223
strategy:
2324
matrix:
2425
include:
25-
- os: macos-13
26-
xcode: Xcode_15.2
27-
- os: macos-14
28-
xcode: Xcode_15.4
2926
- os: macos-15
3027
xcode: Xcode_16.2
28+
- os: macos-16
29+
xcode: Xcode_16.3
3130
runs-on: ${{ matrix.os }}
3231
steps:
3332
- uses: actions/checkout@v4
@@ -71,12 +70,10 @@ jobs:
7170
strategy:
7271
matrix:
7372
include:
74-
- os: macos-13
75-
xcode: Xcode_15.2
7673
- os: macos-14
77-
xcode: Xcode_15.4
78-
- os: macos-15
7974
xcode: Xcode_16.2
75+
- os: macos-15
76+
xcode: Xcode_16.3
8077
runs-on: ${{ matrix.os }}
8178
steps:
8279
- uses: actions/checkout@v4
@@ -95,7 +92,7 @@ jobs:
9592
# Don't run on private repo unless it is a PR.
9693
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
9794

98-
runs-on: macos-14
95+
runs-on: macos-15
9996
steps:
10097
- uses: actions/checkout@v4
10198
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -104,13 +101,15 @@ jobs:
104101
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
105102
- name: Setup Bundler
106103
run: scripts/setup_bundler.sh
104+
- name: Xcode
105+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
107106
- name: Setup project and Build for Catalyst
108107
run: scripts/test_catalyst.sh FirebaseAppDistribution test FirebaseAppDistribution-Unit-unit
109108

110109
appdistribution-cron-only:
111110
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
112111

113-
runs-on: macos-14
112+
runs-on: macos-15
114113
strategy:
115114
matrix:
116115
target: [ios]

‎.github/workflows/archiving.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: archiving
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths:
67
- '.github/workflows/archiving.yml'
@@ -19,7 +20,7 @@ jobs:
1920
# Don't run on private repo.
2021
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
2122

22-
runs-on: macos-14
23+
runs-on: macos-15
2324
strategy:
2425
matrix:
2526
# These need to be on a single line or else the formatting won't validate.
@@ -41,7 +42,7 @@ jobs:
4142
# Don't run on private repo.
4243
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
4344

44-
runs-on: macos-14
45+
runs-on: macos-15
4546
strategy:
4647
matrix:
4748
target: [ios, tvos, macos]

‎.github/workflows/auth.yml

Lines changed: 15 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: auth
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths:
67
- 'FirebaseAuth**'
@@ -29,37 +30,8 @@ jobs:
2930
matrix:
3031
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
3132
target: [ios, tvos, macos --skip-tests, watchos]
32-
os: [macos-14]
33-
xcode: [Xcode_15.2]
34-
runs-on: ${{ matrix.os }}
35-
steps:
36-
- uses: actions/checkout@v4
37-
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
38-
- name: Setup Bundler
39-
run: scripts/setup_bundler.sh
40-
- name: Configure test keychain
41-
run: scripts/configure_test_keychain.sh
42-
- name: Xcode
43-
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
44-
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
45-
with:
46-
timeout_minutes: 120
47-
max_attempts: 3
48-
retry_on: error
49-
retry_wait_seconds: 120
50-
command: scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.tests }}
51-
52-
# TODO: Fix warnings on Xcode 16 and move into matrix above.
53-
pod-lib-lint-xc16:
54-
# Don't run on private repo unless it is a PR.
55-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
56-
57-
strategy:
58-
matrix:
59-
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
60-
target: [ios, tvos, macos --skip-tests --allow-warnings, watchos]
6133
os: [macos-15]
62-
xcode: [Xcode_16.2]
34+
xcode: [Xcode_16.3]
6335
runs-on: ${{ matrix.os }}
6436
steps:
6537
- uses: actions/checkout@v4
@@ -76,12 +48,12 @@ jobs:
7648
max_attempts: 3
7749
retry_on: error
7850
retry_wait_seconds: 120
79-
command: scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.tests }} --allow-warnings
51+
command: scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.tests }}
8052

8153
spm-package-resolved:
8254
env:
8355
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
84-
runs-on: macos-14
56+
runs-on: macos-15
8557
outputs:
8658
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
8759
steps:
@@ -108,29 +80,26 @@ jobs:
10880
strategy:
10981
matrix:
11082
include:
111-
- os: macos-13
112-
xcode: Xcode_15.2
113-
target: iOS spm
11483
- os: macos-14
115-
xcode: Xcode_15.4
84+
xcode: Xcode_16.2
11685
target: iOS spm
11786
- os: macos-15
118-
xcode: Xcode_16.2
87+
xcode: Xcode_16.3
11988
target: iOS spm
12089
- os: macos-15
121-
xcode: Xcode_16.2
90+
xcode: Xcode_16.3
12291
target: tvOS spm
12392
- os: macos-15
124-
xcode: Xcode_16.2
93+
xcode: Xcode_16.3
12594
target: macOS spmbuildonly
12695
- os: macos-15
127-
xcode: Xcode_16.2
96+
xcode: Xcode_16.3
12897
target: watchOS spm
12998
- os: macos-15
130-
xcode: Xcode_16.2
99+
xcode: Xcode_16.3
131100
target: catalyst spm
132101
- os: macos-15
133-
xcode: Xcode_16.2
102+
xcode: Xcode_16.3
134103
target: visionOS spm
135104
runs-on: ${{ matrix.os }}
136105
steps:
@@ -200,7 +169,7 @@ jobs:
200169
catalyst:
201170
# Don't run on private repo unless it is a PR.
202171
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
203-
runs-on: macos-14
172+
runs-on: macos-15
204173
steps:
205174
- uses: actions/checkout@v4
206175
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -209,6 +178,8 @@ jobs:
209178
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
210179
- name: Setup Bundler
211180
run: scripts/setup_bundler.sh
181+
- name: Xcode
182+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
212183
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
213184
with:
214185
timeout_minutes: 120
@@ -269,7 +240,7 @@ jobs:
269240
# Don't run on private repo.
270241
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
271242

272-
runs-on: macos-14
243+
runs-on: macos-15
273244
strategy:
274245
matrix:
275246
# The macos and tvos tests can hang, and watchOS doesn't have tests.

‎.github/workflows/check.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: check
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths-ignore:
67
- 'Firestore/**'

‎.github/workflows/client_app.yml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: client_app
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths:
67
- ".github/workflows/client_app.yml"
@@ -25,19 +26,21 @@ concurrency:
2526
jobs:
2627
client-app-spm:
2728
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
28-
runs-on: macos-14
2929
strategy:
30+
# TODO: Add Xcode matrix when Xcode 16 is ubiquitous on CI runners.
3031
matrix:
3132
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
3233
platform: [iOS]
3334
scheme: [ClientApp]
35+
os: [macos-14, macos-15]
36+
runs-on: ${{ matrix.os }}
3437
steps:
3538
- uses: actions/checkout@v4
3639
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
3740
with:
3841
cache_key: ${{ matrix.os }}
3942
- name: Xcode
40-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
43+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
4144
- name: Build Client App –– ${{ matrix.platform }}
4245
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
4346

@@ -46,29 +49,33 @@ jobs:
4649
env:
4750
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
4851
FIREBASE_SOURCE_FIRESTORE: 1
49-
runs-on: macos-14
5052
strategy:
53+
# TODO: Add Xcode matrix when Xcode 16 is ubiquitous on CI runners.
5154
matrix:
5255
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
5356
platform: [iOS]
5457
scheme: [ClientApp]
58+
os: [macos-14, macos-15]
59+
runs-on: ${{ matrix.os }}
5560
steps:
5661
- uses: actions/checkout@v4
5762
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
5863
with:
5964
cache_key: ${{ matrix.os }}
6065
- name: Xcode
61-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
66+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
6267
- name: Build Client App –– ${{ matrix.platform }}
6368
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
6469

6570
client-app-cocoapods:
6671
# Don't run on private repo unless it is a PR.
6772
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
68-
runs-on: macos-14
6973
strategy:
74+
# TODO: Add Xcode matrix when Xcode 16 is ubiquitous on CI runners.
7075
matrix:
7176
scheme: [ClientApp-CocoaPods]
77+
os: [macos-14, macos-15]
78+
runs-on: ${{ matrix.os }}
7279
steps:
7380
- uses: actions/checkout@v4
7481
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -78,7 +85,7 @@ jobs:
7885
- name: Setup Bundler
7986
run: scripts/setup_bundler.sh
8087
- name: Xcode
81-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
88+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
8289
- name: Prereqs
8390
run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
8491
- name: Build

‎.github/workflows/cocoapods-integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: cocoapods-integration
22

33
on:
4+
workflow_dispatch:
45
pull_request:
56
paths:
67
- 'IntegrationTesting/CocoapodsIntegrationTest/**'
@@ -17,10 +18,9 @@ concurrency:
1718
jobs:
1819
tests:
1920
# Don't run on private repo unless it is a PR.
20-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
21-
|| github.event_name == 'workflow_dispatch'
21+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
2222

23-
runs-on: macos-14
23+
runs-on: macos-15
2424
steps:
2525
- uses: actions/checkout@v4
2626
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

0 commit comments

Comments
 (0)