Skip to content

Commit 51333fe

Browse files
committed
[CI] Update grpc dependent jobs to macos-14
1 parent ba1d106 commit 51333fe

File tree

5 files changed

+7
-35
lines changed

5 files changed

+7
-35
lines changed

.github/workflows/archiving.yml

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,7 @@ jobs:
4646
matrix:
4747
target: [ios, tvos, macos]
4848
# These need to be on a single line or else the formatting won't validate.
49-
pod: ["FirebaseABTesting", "FirebaseAuth", "FirebaseCore", "FirebaseCrashlytics", "FirebaseDatabase", "FirebaseFunctions", "FirebaseMessaging", "FirebaseRemoteConfig", "FirebaseStorage"]
50-
steps:
51-
- uses: actions/checkout@v4
52-
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
53-
with:
54-
cache_key: pods-${{ matrix.os }}
55-
- uses: ruby/setup-ruby@v1
56-
- name: Setup Bundler
57-
run: scripts/setup_bundler.sh
58-
- name: Setup project and archive
59-
run: scripts/test_archiving.sh ${{ matrix.pod }} ${{ matrix.target }} ArchiveOutputs/${{ matrix.target }}.xcarchive
60-
61-
# TODO(#12780: Merge Firestore back into above job after https://github.com/grpc/grpc/pull/36340
62-
pods-ios-tvos-macos-cron-macos12:
63-
# Don't run on private repo.
64-
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule')
65-
66-
runs-on: macos-12
67-
strategy:
68-
matrix:
69-
target: [ios, tvos, macos]
70-
# These need to be on a single line or else the formatting won't validate.
71-
pod: ["FirebaseFirestore"]
49+
pod: ["FirebaseABTesting", "FirebaseAuth", "FirebaseCore", "FirebaseCrashlytics", "FirebaseDatabase", "FirebaseFirestore", "FirebaseFunctions", "FirebaseMessaging", "FirebaseRemoteConfig", "FirebaseStorage"]
7250
steps:
7351
- uses: actions/checkout@v4
7452
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

.github/workflows/firestore.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,8 +326,7 @@ jobs:
326326
if: |
327327
(github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') ||
328328
(github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
329-
# TODO(#12780): macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
330-
runs-on: macos-12
329+
runs-on: macos-14
331330
needs: check
332331

333332
strategy:

.github/workflows/prerelease.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ jobs:
1717
specs_checking:
1818
# Don't run on private repo unless it is a PR.
1919
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'workflow_dispatch'
20-
# TODO(#12780): macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
21-
runs-on: macos-12
20+
runs-on: macos-14
2221
env:
2322
bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
2423
# The SDK repo will be cloned to this dir and podspecs from
@@ -112,8 +111,7 @@ jobs:
112111
needs: [buildup_SpecsTesting_repo_FirebaseCore, specs_checking]
113112
# Don't run on private repo unless it is a PR.
114113
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'workflow_dispatch'
115-
# TODO(#12780): macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
116-
runs-on: macos-12
114+
runs-on: macos-14
117115
strategy:
118116
fail-fast: false
119117
matrix: ${{fromJson(needs.specs_checking.outputs.matrix)}}

.github/workflows/release.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ jobs:
1919
specs_checking:
2020
# Don't run on private repo unless it is a PR.
2121
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'workflow_dispatch'
22-
# TODO(#12780): macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
23-
runs-on: macos-12
22+
runs-on: macos-14
2423
env:
2524
bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
2625
# The SDK repo will be cloned to this dir and podspecs from
@@ -114,8 +113,7 @@ jobs:
114113
needs: [buildup_SpecsTesting_repo_FirebaseCore, specs_checking]
115114
# Don't run on private repo unless it is a PR.
116115
if: github.repository == 'Firebase/firebase-ios-sdk'
117-
# TODO(#12780): macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
118-
runs-on: macos-12
116+
runs-on: macos-14
119117
strategy:
120118
fail-fast: false
121119
matrix: ${{fromJson(needs.specs_checking.outputs.matrix)}}

.github/workflows/spectesting.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ jobs:
4444
specs_testing:
4545
needs: specs_checking
4646
if: ${{ needs.specs_checking.outputs.podspecs != '[]' }}
47-
# TODO: macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
48-
runs-on: macos-12
47+
runs-on: macos-14
4948
strategy:
5049
fail-fast: false
5150
matrix: ${{fromJson(needs.specs_checking.outputs.matrix)}}

0 commit comments

Comments
 (0)