Skip to content

Commit 589ade5

Browse files
ncooke3ncooke3
committed
Merge branch 'main' into nc/swiftui-auth
2 parents aea8b4b + 4b263b6 commit 589ade5

File tree

328 files changed

+5471
-3564
lines changed

Some content is hidden

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

328 files changed

+5471
-3564
lines changed

‎.github/ISSUE_TEMPLATE/BUG_REPORT.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ body:
7474
- Authentication
7575
- Crashlytics
7676
- Database
77+
- Data Connect
7778
- DynamicLinks
7879
- Firestore
7980
- Functions

‎.github/workflows/abtesting.yml‎

Lines changed: 64 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,25 @@ jobs:
2222

2323
strategy:
2424
matrix:
25-
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
26-
target: [ios, tvos, macos --skip-tests, watchos]
27-
os: [macos-14, macos-13]
2825
include:
29-
- os: macos-14
30-
xcode: Xcode_15.3
3126
- os: macos-13
3227
xcode: Xcode_15.2
28+
target: ios
29+
- os: macos-14
30+
xcode: Xcode_15.4
31+
target: ios
32+
- os: macos-15
33+
xcode: Xcode_16
34+
target: ios
35+
- os: macos-15
36+
xcode: Xcode_16
37+
target: tvos
38+
- os: macos-15
39+
xcode: Xcode_16
40+
target: macos
41+
- os: macos-15
42+
xcode: Xcode_16
43+
target: watchos
3344
runs-on: ${{ matrix.os }}
3445
steps:
3546
- uses: actions/checkout@v4
@@ -46,29 +57,67 @@ jobs:
4657
retry_wait_seconds: 120
4758
command: scripts/pod_lib_lint.rb FirebaseABTesting.podspec --platforms=${{ matrix.target }}
4859

60+
spm-package-resolved:
61+
env:
62+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
63+
runs-on: macos-14
64+
outputs:
65+
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
66+
steps:
67+
- uses: actions/checkout@v4
68+
- name: Generate Swift Package.resolved
69+
id: swift_package_resolve
70+
run: |
71+
swift package resolve
72+
- name: Generate cache key
73+
id: generate_cache_key
74+
run: |
75+
cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
76+
echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
77+
- uses: actions/cache/save@v4
78+
id: cache
79+
with:
80+
path: .build
81+
key: ${{ steps.generate_cache_key.outputs.cache_key }}
82+
4983
spm:
5084
# Don't run on private repo unless it is a PR.
5185
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
86+
needs: [spm-package-resolved]
5287
strategy:
5388
matrix:
54-
target: [iOS, tvOS, macOS, catalyst, watchOS]
55-
os: [macos-13, macos-14]
5689
include:
57-
- os: macos-14
58-
xcode: Xcode_15.3
5990
- os: macos-13
6091
xcode: Xcode_15.2
92+
target: iOS
6193
- os: macos-14
62-
xcode: Xcode_15.2
63-
- os: macos-14
64-
xcode: Xcode_15.2
94+
xcode: Xcode_15.4
95+
target: iOS
96+
- os: macos-15
97+
xcode: Xcode_16
98+
target: iOS
99+
- os: macos-15
100+
xcode: Xcode_16
101+
target: tvOS
102+
- os: macos-15
103+
xcode: Xcode_16
104+
target: macOS
105+
- os: macos-15
106+
xcode: Xcode_16
107+
target: watchOS
108+
- os: macos-15
109+
xcode: Xcode_16
110+
target: catalyst
111+
- os: macos-15
112+
xcode: Xcode_16
65113
target: visionOS
66114
runs-on: ${{ matrix.os }}
67115
steps:
68116
- uses: actions/checkout@v4
69-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
117+
- uses: actions/cache/restore@v4
70118
with:
71-
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}-${{ matrix.target }}
119+
path: .build
120+
key: ${{needs.spm-package-resolved.outputs.cache_key}}
72121
- name: Xcode
73122
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
74123
- name: Initialize xcodebuild
@@ -136,7 +185,7 @@ jobs:
136185
steps:
137186
- uses: actions/checkout@v4
138187
- uses: ruby/setup-ruby@v1
139-
- uses: actions/setup-python@v4
188+
- uses: actions/setup-python@v5
140189
with:
141190
python-version: '3.11'
142191
- name: Setup quickstart

‎.github/workflows/api_diff_report.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
echo "file_list=$(git diff --name-only -r HEAD^1 HEAD | tr '\n' ' ')" >> $GITHUB_OUTPUT
3535
3636
- name: Setup python
37-
uses: actions/setup-python@v4
37+
uses: actions/setup-python@v5
3838
with:
3939
python-version: '3.10'
4040

‎.github/workflows/appdistribution.yml‎

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ jobs:
2121

2222
strategy:
2323
matrix:
24-
target: [ios]
25-
os: [macos-14, macos-13]
2624
include:
27-
- os: macos-14
28-
xcode: Xcode_15.3
2925
- os: macos-13
3026
xcode: Xcode_15.2
27+
- os: macos-14
28+
xcode: Xcode_15.4
29+
- os: macos-15
30+
xcode: Xcode_16
3131
runs-on: ${{ matrix.os }}
3232
steps:
3333
- uses: actions/checkout@v4
@@ -39,26 +39,51 @@ jobs:
3939
- name: Build and test
4040
run: |
4141
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseAppDistribution.podspec \
42-
--platforms=${{ matrix.target }}
42+
--platforms=ios
43+
44+
spm-package-resolved:
45+
env:
46+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
47+
runs-on: macos-14
48+
outputs:
49+
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
50+
steps:
51+
- uses: actions/checkout@v4
52+
- name: Generate Swift Package.resolved
53+
id: swift_package_resolve
54+
run: |
55+
swift package resolve
56+
- name: Generate cache key
57+
id: generate_cache_key
58+
run: |
59+
cache_key="${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}"
60+
echo "cache_key=${cache_key}" >> "$GITHUB_OUTPUT"
61+
- uses: actions/cache/save@v4
62+
id: cache
63+
with:
64+
path: .build
65+
key: ${{ steps.generate_cache_key.outputs.cache_key }}
4366

4467
spm:
4568
# Don't run on private repo unless it is a PR.
4669
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
47-
70+
needs: [spm-package-resolved]
4871
strategy:
4972
matrix:
50-
os: [macos-14, macos-13]
5173
include:
52-
- os: macos-14
53-
xcode: Xcode_15.3
5474
- os: macos-13
5575
xcode: Xcode_15.2
76+
- os: macos-14
77+
xcode: Xcode_15.4
78+
- os: macos-15
79+
xcode: Xcode_16
5680
runs-on: ${{ matrix.os }}
5781
steps:
5882
- uses: actions/checkout@v4
59-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
83+
- uses: actions/cache/restore@v4
6084
with:
61-
cache_key: spm${{ matrix.os }}-${{ matrix.xcode }}
85+
path: .build
86+
key: ${{needs.spm-package-resolved.outputs.cache_key}}
6287
- name: Xcode
6388
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
6489
- name: Initialize xcodebuild

0 commit comments

Comments
 (0)