Skip to content

Commit 65ab3e8

Browse files
andrewheardandrewheard
committed
Merge remote-tracking branch 'origin/main' into vertexai-release
2 parents 78c341f + f909f90 commit 65ab3e8

37 files changed

+667
-400
lines changed

‎.github/workflows/abtesting.yml

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
command: scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=${{ matrix.target }}
4444

4545
spm-package-resolved:
46+
env:
47+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
4648
runs-on: macos-14
4749
outputs:
4850
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}

‎.github/workflows/appdistribution.yml

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ jobs:
3838
--platforms=${{ matrix.target }}
3939
4040
spm-package-resolved:
41+
env:
42+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
4143
runs-on: macos-14
4244
outputs:
4345
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}

‎.github/workflows/auth.yml

+44-41
Original file line numberDiff line numberDiff line change
@@ -78,50 +78,10 @@ jobs:
7878
retry_wait_seconds: 120
7979
command: scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.tests }} --allow-warnings
8080

81-
integration-tests:
82-
# Don't run on private repo unless it is a PR.
83-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
84-
strategy:
85-
matrix:
86-
scheme: [ObjCApiTests, SwiftApiTests, AuthenticationExampleUITests]
87-
81+
spm-package-resolved:
8882
env:
89-
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
9083
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
9184
runs-on: macos-14
92-
steps:
93-
- uses: actions/checkout@v4
94-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
95-
with:
96-
cache_key: integration-tests${{ matrix.os }}
97-
- name: Install Secrets
98-
run: |
99-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthCredentials.h.gpg \
100-
FirebaseAuth/Tests/SampleSwift/ObjCApiTests/AuthCredentials.h "$plist_secret"
101-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg \
102-
FirebaseAuth/Tests/SampleSwift/AuthenticationExample/SwiftApplication.plist "$plist_secret"
103-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/AuthCredentials.h.gpg \
104-
FirebaseAuth/Tests/SampleSwift/AuthCredentials.h "$plist_secret"
105-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info.plist.gpg \
106-
FirebaseAuth/Tests/SampleSwift/GoogleService-Info.plist "$plist_secret"
107-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info_multi.plist.gpg \
108-
FirebaseAuth/Tests/SampleSwift/GoogleService-Info_multi.plist "$plist_secret"
109-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Sample.entitlements.gpg \
110-
FirebaseAuth/Tests/SampleSwift/Sample.entitlements "$plist_secret"
111-
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
112-
FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
113-
- name: Xcode
114-
run: sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
115-
- uses: nick-fields/retry@v3
116-
with:
117-
timeout_minutes: 120
118-
max_attempts: 3
119-
retry_on: error
120-
retry_wait_seconds: 120
121-
command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
122-
123-
spm-package-resolved:
124-
runs-on: macos-14
12585
outputs:
12686
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
12787
steps:
@@ -169,6 +129,49 @@ jobs:
169129
retry_wait_seconds: 120
170130
command: scripts/third_party/travis/retry.sh ./scripts/build.sh AuthUnit ${{ matrix.target }}
171131

132+
integration-tests:
133+
# Don't run on private repo unless it is a PR.
134+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
135+
needs: [spm-package-resolved]
136+
strategy:
137+
matrix:
138+
scheme: [ObjCApiTests, SwiftApiTests, AuthenticationExampleUITests]
139+
env:
140+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
141+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
142+
runs-on: macos-14
143+
steps:
144+
- uses: actions/checkout@v4
145+
- uses: actions/cache/restore@v4
146+
with:
147+
path: .build
148+
key: ${{needs.spm-package-resolved.outputs.cache_key}}
149+
- name: Install Secrets
150+
run: |
151+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthCredentials.h.gpg \
152+
FirebaseAuth/Tests/SampleSwift/ObjCApiTests/AuthCredentials.h "$plist_secret"
153+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg \
154+
FirebaseAuth/Tests/SampleSwift/AuthenticationExample/SwiftApplication.plist "$plist_secret"
155+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/AuthCredentials.h.gpg \
156+
FirebaseAuth/Tests/SampleSwift/AuthCredentials.h "$plist_secret"
157+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info.plist.gpg \
158+
FirebaseAuth/Tests/SampleSwift/GoogleService-Info.plist "$plist_secret"
159+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info_multi.plist.gpg \
160+
FirebaseAuth/Tests/SampleSwift/GoogleService-Info_multi.plist "$plist_secret"
161+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Sample.entitlements.gpg \
162+
FirebaseAuth/Tests/SampleSwift/Sample.entitlements "$plist_secret"
163+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
164+
FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
165+
- name: Xcode
166+
run: sudo xcode-select -s /Applications/Xcode_15.4.app/Contents/Developer
167+
- uses: nick-fields/retry@v3
168+
with:
169+
timeout_minutes: 120
170+
max_attempts: 3
171+
retry_on: error
172+
retry_wait_seconds: 120
173+
command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
174+
172175
catalyst:
173176
# Don't run on private repo unless it is a PR.
174177
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'

‎.github/workflows/core.yml

+31-18
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,8 @@ jobs:
2222
matrix:
2323
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
2424
target: [ios, tvos, macos --skip-tests, watchos]
25-
os: [macos-14, macos-13]
26-
include:
27-
- os: macos-14
28-
xcode: Xcode_15.3
29-
- os: macos-13
30-
xcode: Xcode_15.2
25+
os: [macos-14]
26+
xcode: [Xcode_15.2, Xcode_16]
3127
runs-on: ${{ matrix.os }}
3228
steps:
3329
- uses: actions/checkout@v4
@@ -39,28 +35,45 @@ jobs:
3935
- name: Build and test
4036
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCore.podspec --platforms=${{ matrix.target }}
4137

38+
spm-package-resolved:
39+
env:
40+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
41+
runs-on: macos-14
42+
outputs:
43+
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
44+
steps:
45+
- uses: actions/checkout@v4
46+
- name: Generate Swift Package.resolved
47+
id: swift_package_resolve
48+
run: |
49+
swift package resolve
50+
- name: Generate cache key
51+
id: generate_cache_key
52+
run: |
53+
cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
54+
echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
55+
- uses: actions/cache/save@v4
56+
id: cache
57+
with:
58+
path: .build
59+
key: ${{ steps.generate_cache_key.outputs.cache_key }}
60+
4261
spm:
4362
# Don't run on private repo unless it is a PR.
4463
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
64+
needs: [spm-package-resolved]
4565
strategy:
46-
max-parallel: 1
4766
matrix:
4867
target: [iOS, tvOS, macOS, catalyst, watchOS]
49-
os: [macos-13, macos-14]
50-
include:
51-
- os: macos-13
52-
xcode: Xcode_15.2
53-
- os: macos-14
54-
xcode: Xcode_15.3
55-
- os: macos-14
56-
xcode: Xcode_15.3
57-
target: visionOS
68+
os: [macos-14]
69+
xcode: [Xcode_15.2, Xcode_16]
5870
runs-on: ${{ matrix.os }}
5971
steps:
6072
- uses: actions/checkout@v4
61-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
73+
- uses: actions/cache/restore@v4
6274
with:
63-
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
75+
path: .build
76+
key: ${{needs.spm-package-resolved.outputs.cache_key}}
6477
- name: Xcode
6578
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
6679
- name: Initialize xcodebuild

‎.github/workflows/core_extension.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,8 @@ jobs:
2020
strategy:
2121
matrix:
2222
target: [ios, tvos, macos, watchos]
23-
os: [macos-14, macos-13]
24-
include:
25-
- os: macos-14
26-
xcode: Xcode_15.3
27-
- os: macos-13
28-
xcode: Xcode_15.2
23+
os: [macos-14]
24+
xcode: [Xcode_15.2, Xcode_16]
2925
runs-on: ${{ matrix.os }}
3026
steps:
3127
- uses: actions/checkout@v4

‎.github/workflows/core_internal.yml

+32-16
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@ jobs:
1818
strategy:
1919
matrix:
2020
target: [ios, tvos, macos, watchos]
21-
os: [macos-14, macos-13]
22-
include:
23-
- os: macos-14
24-
xcode: Xcode_15.3
25-
- os: macos-13
26-
xcode: Xcode_15.2
21+
os: [macos-14]
22+
xcode: [Xcode_15.2, Xcode_16]
2723
runs-on: ${{ matrix.os }}
2824
steps:
2925
- uses: actions/checkout@v4
@@ -35,25 +31,45 @@ jobs:
3531
- name: Build and test
3632
run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseCoreInternal.podspec --platforms=${{ matrix.target }}
3733

34+
spm-package-resolved:
35+
env:
36+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
37+
runs-on: macos-14
38+
outputs:
39+
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
40+
steps:
41+
- uses: actions/checkout@v4
42+
- name: Generate Swift Package.resolved
43+
id: swift_package_resolve
44+
run: |
45+
swift package resolve
46+
- name: Generate cache key
47+
id: generate_cache_key
48+
run: |
49+
cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
50+
echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
51+
- uses: actions/cache/save@v4
52+
id: cache
53+
with:
54+
path: .build
55+
key: ${{ steps.generate_cache_key.outputs.cache_key }}
56+
3857
spm:
3958
# Don't run on private repo unless it is a PR.
4059
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
60+
needs: [spm-package-resolved]
4161
strategy:
42-
max-parallel: 1
4362
matrix:
4463
target: [iOS, tvOS, macOS, catalyst, watchOS]
45-
os: [macos-13, macos-14]
46-
include:
47-
- os: macos-13
48-
xcode: Xcode_15.2
49-
- os: macos-14
50-
xcode: Xcode_15.3
51-
- os: macos-14
52-
xcode: Xcode_15.3
53-
target: visionOS
64+
os: [macos-14]
65+
xcode: [Xcode_15.2, Xcode_16]
5466
runs-on: ${{ matrix.os }}
5567
steps:
5668
- uses: actions/checkout@v4
69+
- uses: actions/cache/restore@v4
70+
with:
71+
path: .build
72+
key: ${{needs.spm-package-resolved.outputs.cache_key}}
5773
- name: Initialize xcodebuild
5874
run: scripts/setup_spm_tests.sh
5975
- name: Xcode

‎.github/workflows/crashlytics.yml

+32-20
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,12 @@ jobs:
2525
strategy:
2626
matrix:
2727
target: [ios, tvos, macos, watchos --skip-tests]
28-
os: [macos-14, macos-13]
28+
os: [macos-14]
2929
flags: [
3030
'--use-modular-headers',
3131
''
3232
]
33-
include:
34-
- os: macos-14
35-
xcode: Xcode_15.3
36-
tests: --skip-tests
37-
- os: macos-13
38-
xcode: Xcode_15.2
39-
tests:
33+
xcode: [Xcode_15.2, Xcode_16]
4034
runs-on: ${{ matrix.os }}
4135
steps:
4236
- uses: actions/checkout@v4
@@ -53,28 +47,46 @@ jobs:
5347
retry_wait_seconds: 120
5448
command: scripts/pod_lib_lint.rb FirebaseCrashlytics.podspec --platforms=${{ matrix.target }} ${{ matrix.tests }} ${{ matrix.flags }}
5549

50+
51+
spm-package-resolved:
52+
env:
53+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
54+
runs-on: macos-14
55+
outputs:
56+
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
57+
steps:
58+
- uses: actions/checkout@v4
59+
- name: Generate Swift Package.resolved
60+
id: swift_package_resolve
61+
run: |
62+
swift package resolve
63+
- name: Generate cache key
64+
id: generate_cache_key
65+
run: |
66+
cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
67+
echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
68+
- uses: actions/cache/save@v4
69+
id: cache
70+
with:
71+
path: .build
72+
key: ${{ steps.generate_cache_key.outputs.cache_key }}
73+
5674
spm:
5775
# Don't run on private repo unless it is a PR.
5876
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
77+
needs: [spm-package-resolved]
5978
strategy:
60-
max-parallel: 1
6179
matrix:
6280
target: [iOS, tvOS, macOS, catalyst, watchOS]
63-
os: [macos-13, macos-14]
64-
include:
65-
- os: macos-13
66-
xcode: Xcode_15.2
67-
- os: macos-14
68-
xcode: Xcode_15.3
69-
- os: macos-14
70-
xcode: Xcode_15.3
71-
target: visionOS
81+
os: [macos-14]
82+
xcode: [Xcode_15.2, Xcode_16]
7283
runs-on: ${{ matrix.os }}
7384
steps:
7485
- uses: actions/checkout@v4
75-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
86+
- uses: actions/cache/restore@v4
7687
with:
77-
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
88+
path: .build
89+
key: ${{needs.spm-package-resolved.outputs.cache_key}}
7890
- name: Xcode
7991
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
8092
- name: Initialize xcodebuild

0 commit comments

Comments
 (0)