Skip to content

Commit 7a3d30f

Browse files
paulb777paulb777
authored
Merge e6d65a3 into a58216a 
2 parents a58216a + e6d65a3 commit 7a3d30f

Some content is hidden

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

57 files changed

+358
-375
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
matrix:
2525
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
2626
target: [ios, tvos, macos --skip-tests, watchos]
27-
os: [macos-12, macos-13]
27+
os: [macos-14, macos-13]
2828
include:
29-
- os: macos-12
30-
xcode: Xcode_14.2
29+
- os: macos-14
30+
xcode: Xcode_15.3
3131
- os: macos-13
3232
xcode: Xcode_15.2
3333
runs-on: ${{ matrix.os }}
@@ -52,10 +52,10 @@ jobs:
5252
strategy:
5353
matrix:
5454
target: [iOS, tvOS, macOS, catalyst, watchOS]
55-
os: [macos-12, macos-13, macos-14]
55+
os: [macos-13, macos-14]
5656
include:
57-
- os: macos-12
58-
xcode: Xcode_14.2
57+
- os: macos-14
58+
xcode: Xcode_15.3
5959
- os: macos-13
6060
xcode: Xcode_15.2
6161
- os: macos-14
@@ -85,7 +85,7 @@ jobs:
8585
# Don't run on private repo unless it is a PR.
8686
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
8787

88-
runs-on: macos-12
88+
runs-on: macos-14
8989
steps:
9090
- uses: actions/checkout@v4
9191
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -109,7 +109,7 @@ jobs:
109109
env:
110110
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
111111
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
112-
runs-on: macos-12
112+
runs-on: macos-14
113113
steps:
114114
- uses: actions/checkout@v4
115115
- uses: ruby/setup-ruby@v1
@@ -132,7 +132,7 @@ jobs:
132132
env:
133133
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
134134
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
135-
runs-on: macos-12
135+
runs-on: macos-14
136136
steps:
137137
- uses: actions/checkout@v4
138138
- uses: ruby/setup-ruby@v1
@@ -161,7 +161,7 @@ jobs:
161161
# Don't run on private repo.
162162
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
163163

164-
runs-on: macos-12
164+
runs-on: macos-14
165165
strategy:
166166
matrix:
167167
target: [ios, tvos, macos]

‎.github/workflows/analytics.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ jobs:
2323
strategy:
2424
matrix:
2525
target: [ios, tvos, macos]
26-
os: [macos-12, macos-13]
26+
os: [macos-14, macos-13]
2727
include:
28-
- os: macos-12
29-
xcode: Xcode_14.2
28+
- os: macos-14
29+
xcode: Xcode_15.3
3030
- os: macos-13
3131
xcode: Xcode_15.2
3232
runs-on: ${{ matrix.os }}

‎.github/workflows/appdistribution.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
strategy:
2323
matrix:
2424
target: [ios]
25-
os: [macos-12, macos-13]
25+
os: [macos-14, macos-13]
2626
include:
27-
- os: macos-12
28-
xcode: Xcode_14.2
27+
- os: macos-14
28+
xcode: Xcode_15.3
2929
- os: macos-13
3030
xcode: Xcode_15.2
3131
runs-on: ${{ matrix.os }}
@@ -47,10 +47,10 @@ jobs:
4747

4848
strategy:
4949
matrix:
50-
os: [macos-12, macos-13]
50+
os: [macos-14, macos-13]
5151
include:
52-
- os: macos-12
53-
xcode: Xcode_14.2
52+
- os: macos-14
53+
xcode: Xcode_15.3
5454
- os: macos-13
5555
xcode: Xcode_15.2
5656
runs-on: ${{ matrix.os }}
@@ -70,7 +70,7 @@ jobs:
7070
# Don't run on private repo unless it is a PR.
7171
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
7272

73-
runs-on: macos-12
73+
runs-on: macos-14
7474
steps:
7575
- uses: actions/checkout@v4
7676
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -85,7 +85,7 @@ jobs:
8585
appdistribution-cron-only:
8686
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
8787

88-
runs-on: macos-12
88+
runs-on: macos-14
8989
strategy:
9090
matrix:
9191
target: [ios]

‎.github/workflows/archiving.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# Don't run on private repo.
2020
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
2121

22-
runs-on: macos-12
22+
runs-on: macos-14
2323
strategy:
2424
matrix:
2525
# These need to be on a single line or else the formatting won't validate.
@@ -41,7 +41,7 @@ jobs:
4141
# Don't run on private repo.
4242
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
4343

44-
runs-on: macos-12
44+
runs-on: macos-14
4545
strategy:
4646
matrix:
4747
target: [ios, tvos, macos]

‎.github/workflows/auth.yml‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ jobs:
2626
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
2727
# TODO: macos tests are blocked by https://github.com/erikdoe/ocmock/pull/532
2828
target: [ios, tvos, macos --skip-tests, watchos]
29-
os: [macos-12, macos-13]
29+
os: [macos-14, macos-13]
3030
include:
31-
- os: macos-12
32-
xcode: Xcode_14.2
31+
- os: macos-14
32+
xcode: Xcode_15.3
3333
tests: --skip-tests
3434
- os: macos-13
3535
xcode: Xcode_15.2
@@ -101,19 +101,16 @@ jobs:
101101
strategy:
102102
matrix:
103103
target: [iOS, tvOS, macOS, catalyst, watchOS]
104-
os: [macos-12, macos-13, macos-14]
104+
os: [macos-13, macos-14]
105105
include:
106-
- os: macos-12
107-
xcode: Xcode_14.2
108-
test: spm
109106
- os: macos-13
110107
xcode: Xcode_15.2
111108
test: spmbuildonly
112109
- os: macos-14
113-
xcode: Xcode_15.2
110+
xcode: Xcode_15.3
114111
test: spmbuildonly
115112
- os: macos-14
116-
xcode: Xcode_15.2
113+
xcode: Xcode_15.3
117114
target: visionOS
118115
test: spm
119116
runs-on: ${{ matrix.os }}
@@ -137,7 +134,7 @@ jobs:
137134
catalyst:
138135
# Don't run on private repo unless it is a PR.
139136
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
140-
runs-on: macos-12
137+
runs-on: macos-14
141138
steps:
142139
- uses: actions/checkout@v4
143140
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -161,7 +158,7 @@ jobs:
161158
env:
162159
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
163160
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
164-
runs-on: macos-12
161+
runs-on: macos-14
165162
steps:
166163
- uses: actions/checkout@v4
167164
- uses: ruby/setup-ruby@v1
@@ -181,7 +178,7 @@ jobs:
181178
# env:
182179
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
183180
# signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
184-
# runs-on: macos-12
181+
# runs-on: macos-14
185182
# steps:
186183
# - uses: actions/checkout@v4
187184
# - uses: ruby/setup-ruby@v1
@@ -203,7 +200,7 @@ jobs:
203200
# Don't run on private repo.
204201
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
205202

206-
runs-on: macos-12
203+
runs-on: macos-14
207204
strategy:
208205
matrix:
209206
# The macos and tvos tests can hang, and watchOS doesn't have tests.

‎.github/workflows/check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
check:
1616
# Don't run on private repo.
1717
if: github.repository == 'Firebase/firebase-ios-sdk'
18-
runs-on: macos-12
18+
runs-on: macos-14
1919
env:
2020
MINT_PATH: ${{ github.workspace }}/mint
2121
steps:

‎.github/workflows/client_app.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ concurrency:
2525
jobs:
2626
client-app-spm:
2727
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
28-
runs-on: macos-12
28+
runs-on: macos-14
2929
strategy:
3030
matrix:
3131
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -44,7 +44,7 @@ jobs:
4444
env:
4545
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
4646
FIREBASE_SOURCE_FIRESTORE: 1
47-
runs-on: macos-12
47+
runs-on: macos-14
4848
strategy:
4949
matrix:
5050
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -61,7 +61,7 @@ jobs:
6161
client-app-cocoapods:
6262
# Don't run on private repo unless it is a PR.
6363
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
64-
runs-on: macos-12
64+
runs-on: macos-14
6565
strategy:
6666
matrix:
6767
scheme: [ClientApp-CocoaPods, ClientApp-CocoaPods-iOS13]

‎.github/workflows/cocoapods-integration.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
# Don't run on private repo unless it is a PR.
2020
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
2121

22-
runs-on: macos-12
22+
runs-on: macos-14
2323
steps:
2424
- uses: actions/checkout@v4
2525
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

‎.github/workflows/combine.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
xcodebuild:
4949
# Don't run on private repo unless it is a PR.
5050
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
51-
runs-on: macos-12
51+
runs-on: macos-14
5252

5353
strategy:
5454
matrix:
@@ -76,7 +76,7 @@ jobs:
7676
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
7777
env:
7878
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
79-
runs-on: macos-12
79+
runs-on: macos-14
8080
steps:
8181
- uses: actions/checkout@v4
8282
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

‎.github/workflows/core.yml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ 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-12, macos-13]
25+
os: [macos-14, macos-13]
2626
include:
27-
- os: macos-12
28-
xcode: Xcode_14.2
27+
- os: macos-14
28+
xcode: Xcode_15.3
2929
- os: macos-13
3030
xcode: Xcode_15.2
3131
runs-on: ${{ matrix.os }}
@@ -45,16 +45,14 @@ jobs:
4545
strategy:
4646
matrix:
4747
target: [iOS, tvOS, macOS, catalyst, watchOS]
48-
os: [macos-12, macos-13, macos-14]
48+
os: [macos-13, macos-14]
4949
include:
50-
- os: macos-12
51-
xcode: Xcode_14.2
5250
- os: macos-13
5351
xcode: Xcode_15.2
5452
- os: macos-14
55-
xcode: Xcode_15.2
53+
xcode: Xcode_15.3
5654
- os: macos-14
57-
xcode: Xcode_15.2
55+
xcode: Xcode_15.3
5856
target: visionOS
5957
runs-on: ${{ matrix.os }}
6058
steps:

0 commit comments

Comments
 (0)