Skip to content

Commit 7180680

Browse files
paulb777paulb777
committed
More CI updates for Xcode 16 minimum
1 parent 470b0b0 commit 7180680

File tree

9 files changed

+49
-89
lines changed

9 files changed

+49
-89
lines changed

‎.github/workflows/analytics.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ jobs:
2323
strategy:
2424
matrix:
2525
target: [ios, tvos, macos]
26-
os: [macos-14, macos-13]
26+
os: [macos-14, macos-15]
2727
include:
2828
- os: macos-14
29-
xcode: Xcode_15.3
30-
- os: macos-13
31-
xcode: Xcode_15.2
29+
xcode: Xcode_16.2
30+
- os: macos-15
31+
xcode: Xcode_16.3
3232
runs-on: ${{ matrix.os }}
3333

3434
steps:

‎.github/workflows/appdistribution.yml‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,10 @@ jobs:
2222
strategy:
2323
matrix:
2424
include:
25-
- os: macos-13
26-
xcode: Xcode_15.2
27-
- os: macos-14
28-
xcode: Xcode_15.4
2925
- os: macos-15
3026
xcode: Xcode_16.2
27+
- os: macos-16
28+
xcode: Xcode_16.3
3129
runs-on: ${{ matrix.os }}
3230
steps:
3331
- uses: actions/checkout@v4
@@ -71,12 +69,10 @@ jobs:
7169
strategy:
7270
matrix:
7371
include:
74-
- os: macos-13
75-
xcode: Xcode_15.2
76-
- os: macos-14
77-
xcode: Xcode_15.4
7872
- os: macos-15
7973
xcode: Xcode_16.2
74+
- os: macos-16
75+
xcode: Xcode_16.3
8076
runs-on: ${{ matrix.os }}
8177
steps:
8278
- uses: actions/checkout@v4
@@ -95,7 +91,7 @@ jobs:
9591
# Don't run on private repo unless it is a PR.
9692
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
9793

98-
runs-on: macos-14
94+
runs-on: macos-15
9995
steps:
10096
- uses: actions/checkout@v4
10197
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -110,7 +106,7 @@ jobs:
110106
appdistribution-cron-only:
111107
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
112108

113-
runs-on: macos-14
109+
runs-on: macos-15
114110
strategy:
115111
matrix:
116112
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-14
22+
runs-on: macos-15
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-14
44+
runs-on: macos-15
4545
strategy:
4646
matrix:
4747
target: [ios, tvos, macos]

‎.github/workflows/auth.yml‎

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -29,37 +29,8 @@ jobs:
2929
matrix:
3030
podspec: [FirebaseAuthInterop.podspec, FirebaseAuth.podspec]
3131
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]
6132
os: [macos-15]
62-
xcode: [Xcode_16.2]
33+
xcode: [Xcode_16.3]
6334
runs-on: ${{ matrix.os }}
6435
steps:
6536
- uses: actions/checkout@v4
@@ -76,12 +47,12 @@ jobs:
7647
max_attempts: 3
7748
retry_on: error
7849
retry_wait_seconds: 120
79-
command: scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.tests }} --allow-warnings
50+
command: scripts/pod_lib_lint.rb ${{ matrix.podspec }} --platforms=${{ matrix.target }} ${{ matrix.tests }}
8051

8152
spm-package-resolved:
8253
env:
8354
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
84-
runs-on: macos-14
55+
runs-on: macos-15
8556
outputs:
8657
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
8758
steps:
@@ -108,29 +79,26 @@ jobs:
10879
strategy:
10980
matrix:
11081
include:
111-
- os: macos-13
112-
xcode: Xcode_15.2
113-
target: iOS spm
11482
- os: macos-14
115-
xcode: Xcode_15.4
83+
xcode: Xcode_16.2
11684
target: iOS spm
11785
- os: macos-15
118-
xcode: Xcode_16.2
86+
xcode: Xcode_16.3
11987
target: iOS spm
12088
- os: macos-15
121-
xcode: Xcode_16.2
89+
xcode: Xcode_16.3
12290
target: tvOS spm
12391
- os: macos-15
124-
xcode: Xcode_16.2
92+
xcode: Xcode_16.3
12593
target: macOS spmbuildonly
12694
- os: macos-15
127-
xcode: Xcode_16.2
95+
xcode: Xcode_16.3
12896
target: watchOS spm
12997
- os: macos-15
130-
xcode: Xcode_16.2
98+
xcode: Xcode_16.3
13199
target: catalyst spm
132100
- os: macos-15
133-
xcode: Xcode_16.2
101+
xcode: Xcode_16.3
134102
target: visionOS spm
135103
runs-on: ${{ matrix.os }}
136104
steps:
@@ -269,7 +237,7 @@ jobs:
269237
# Don't run on private repo.
270238
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
271239

272-
runs-on: macos-14
240+
runs-on: macos-15
273241
strategy:
274242
matrix:
275243
# The macos and tvos tests can hang, and watchOS doesn't have tests.

‎.github/workflows/client_app.yml‎

Lines changed: 6 additions & 6 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-14
28+
runs-on: macos-15
2929
strategy:
3030
matrix:
3131
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
cache_key: ${{ matrix.os }}
3939
- name: Xcode
40-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
40+
run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
4141
- name: Build Client App –– ${{ matrix.platform }}
4242
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
4343

@@ -46,7 +46,7 @@ jobs:
4646
env:
4747
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
4848
FIREBASE_SOURCE_FIRESTORE: 1
49-
runs-on: macos-14
49+
runs-on: macos-15
5050
strategy:
5151
matrix:
5252
#TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
@@ -58,14 +58,14 @@ jobs:
5858
with:
5959
cache_key: ${{ matrix.os }}
6060
- name: Xcode
61-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
61+
run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
6262
- name: Build Client App –– ${{ matrix.platform }}
6363
run: scripts/third_party/travis/retry.sh ./scripts/build.sh ${{ matrix.scheme }} ${{ matrix.platform }} xcodebuild
6464

6565
client-app-cocoapods:
6666
# Don't run on private repo unless it is a PR.
6767
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
68-
runs-on: macos-14
68+
runs-on: macos-15
6969
strategy:
7070
matrix:
7171
scheme: [ClientApp-CocoaPods]
@@ -78,7 +78,7 @@ jobs:
7878
- name: Setup Bundler
7979
run: scripts/setup_bundler.sh
8080
- name: Xcode
81-
run: sudo xcode-select -s /Applications/Xcode_15.2.app/Contents/Developer
81+
run: sudo xcode-select -s /Applications/Xcode_16.3.app/Contents/Developer
8282
- name: Prereqs
8383
run: scripts/install_prereqs.sh ClientApp iOS xcodebuild
8484
- name: Build

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@ concurrency:
1717
jobs:
1818
tests:
1919
# 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'
20+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' || github.event_name == 'workflow_dispatch'
2221

23-
runs-on: macos-14
22+
runs-on: macos-15
2423
steps:
2524
- uses: actions/checkout@v4
2625
- 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-14
51+
runs-on: macos-15
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-14
79+
runs-on: macos-15
8080
steps:
8181
- uses: actions/checkout@v4
8282
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

‎.github/workflows/core.yml‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
target: [ios, tvos, macos --skip-tests, watchos]
2525
build-env:
2626
- os: macos-14
27-
xcode: Xcode_15.2
28-
- os: macos-15
2927
xcode: Xcode_16.2
28+
- os: macos-15
29+
xcode: Xcode_16.3
3030
runs-on: ${{ matrix.build-env.os }}
3131
steps:
3232
- uses: actions/checkout@v4
@@ -41,7 +41,7 @@ jobs:
4141
spm-package-resolved:
4242
env:
4343
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
44-
runs-on: macos-14
44+
runs-on: macos-15
4545
outputs:
4646
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
4747
steps:
@@ -68,29 +68,26 @@ jobs:
6868
strategy:
6969
matrix:
7070
include:
71-
- os: macos-13
72-
xcode: Xcode_15.2
73-
target: iOS
74-
- os: macos-14
75-
xcode: Xcode_15.4
76-
target: iOS
7771
- os: macos-15
7872
xcode: Xcode_16.2
7973
target: iOS
8074
- os: macos-15
81-
xcode: Xcode_16.2
75+
xcode: Xcode_16.3
76+
target: iOS
77+
- os: macos-15
78+
xcode: Xcode_16.3
8279
target: tvOS
8380
- os: macos-15
84-
xcode: Xcode_16.2
81+
xcode: Xcode_16.3
8582
target: macOS
8683
- os: macos-15
87-
xcode: Xcode_16.2
84+
xcode: Xcode_16.3
8885
target: watchOS
8986
- os: macos-15
90-
xcode: Xcode_16.2
87+
xcode: Xcode_16.3
9188
target: catalyst
9289
- os: macos-15
93-
xcode: Xcode_16.2
90+
xcode: Xcode_16.3
9491
target: visionOS
9592
runs-on: ${{ matrix.os }}
9693
steps:
@@ -113,7 +110,7 @@ jobs:
113110
# Don't run on private repo unless it is a PR.
114111
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
115112

116-
runs-on: macos-13
113+
runs-on: macos-15
117114
steps:
118115
- uses: actions/checkout@v4
119116
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -129,7 +126,7 @@ jobs:
129126
# Don't run on private repo.
130127
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
131128

132-
runs-on: macos-13
129+
runs-on: macos-15
133130
strategy:
134131
matrix:
135132
target: [ios, tvos, macos]

‎.github/workflows/core_extension.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222
target: [ios, tvos, macos, watchos]
2323
build-env:
2424
- os: macos-14
25-
xcode: Xcode_15.2
26-
- os: macos-15
2725
xcode: Xcode_16.2
26+
- os: macos-15
27+
xcode: Xcode_16.3
2828
runs-on: ${{ matrix.build-env.os }}
2929
steps:
3030
- uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
3939
core-internal-cron-only:
4040
# Don't run on private repo.
4141
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
42-
runs-on: macos-14
42+
runs-on: macos-15
4343
strategy:
4444
matrix:
4545
target: [ios, tvos, macos]

0 commit comments

Comments
 (0)