Skip to content

Commit 9569aa4

Browse files
authored
refactor: Remove is_legacy QS testing flags (#15353)
1 parent 8a9676e commit 9569aa4

20 files changed

+527
-544
lines changed

.github/workflows/abtesting.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ jobs:
4545
uses: ./.github/workflows/common_quickstart.yml
4646
with:
4747
product: ABTesting
48-
is_legacy: true
49-
setup_command: QUICKSTART_BRANCH=nc/quickstarts scripts/setup_quickstart_spm.sh abtesting
48+
setup_command: scripts/setup_quickstart_spm.sh abtesting
5049
plist_src_path: scripts/gha-encrypted/qs-abtesting.plist.gpg
5150
plist_dst_path: quickstart-ios/abtesting/GoogleService-Info.plist
5251
secrets:
@@ -67,7 +66,6 @@ jobs:
6766
# python-version: '3.11'
6867
# - name: Setup quickstart
6968
# env:
70-
# LEGACY: true
7169
# run: scripts/setup_quickstart.sh abtesting
7270
# - name: Install Secret GoogleService-Info.plist
7371
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
@@ -76,7 +74,6 @@ jobs:
7674
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
7775
# - name: Build swift quickstart
7876
# env:
79-
# LEGACY: true
8077
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh ABTesting)
8178
# - id: ftl_test
8279
# uses: FirebaseExtended/github-actions/[email protected]

.github/workflows/auth.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,7 @@ jobs:
9797
uses: ./.github/workflows/common_quickstart.yml
9898
with:
9999
product: Authentication
100-
is_legacy: false
101-
setup_command: QUICKSTART_BRANCH=nc/quickstarts scripts/setup_quickstart_spm.sh authentication
100+
setup_command: scripts/setup_quickstart_spm.sh authentication
102101
plist_src_path: scripts/gha-encrypted/qs-authentication.plist.gpg
103102
plist_dst_path: quickstart-ios/authentication/GoogleService-Info.plist
104103
run_tests: false

.github/workflows/common_quickstart.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@ on:
2929
type: string
3030
required: true
3131

32-
# Whether to test the legacy version of the quickstart.
33-
is_legacy:
34-
type: boolean
35-
required: true
32+
# The branch to checkout in the quickstart repo.
33+
quickstart_branch:
34+
type: string
35+
required: false
36+
# default: 'main' # TODO: Revert to main before merging.
37+
default: 'nc/quickstarts'
3638

3739
# The path to the encrypted `GoogleService-Info.plist` file.
3840
plist_src_path:
@@ -60,11 +62,12 @@ on:
6062

6163
jobs:
6264
quickstart:
65+
name: quickstart (${{ inputs.product }})
6366
# Run on the main repo's scheduled jobs or pull requests and manual workflow invocations.
6467
if: (github.repository == 'firebase/firebase-ios-sdk' && github.event_name == 'schedule') || contains(fromJSON('["pull_request", "workflow_dispatch"]'), github.event_name)
6568
env:
6669
plist_secret: ${{ secrets.plist_secret }}
67-
LEGACY: ${{ inputs.is_legacy && true || '' }}
70+
QUICKSTART_BRANCH: ${{ inputs.quickstart_branch }}
6871
runs-on: macos-15
6972
steps:
7073
- uses: actions/checkout@v4
@@ -81,7 +84,7 @@ jobs:
8184
${{ inputs.plist_src_path }} \
8285
${{ inputs.plist_dst_path }} \
8386
"$plist_secret"
84-
- name: Build ${{ inputs.product }} Quickstart (${{ inputs.is_legacy && 'Legacy' || 'Non-Legacy' }})
87+
- name: Build ${{ inputs.product }} Quickstart
8588
uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
8689
with:
8790
timeout_minutes: 15
@@ -90,7 +93,7 @@ jobs:
9093
command: |
9194
SPM=true DIR=${{ inputs.product }} scripts/test_quickstart.sh \
9295
${{ inputs.product }} \
93-
${{ inputs.run_tests }} \
96+
${{ inputs.run_tests }}
9497
# Failure sequence to upload artifact.
9598
- id: lowercase_product
9699
if: ${{ failure() }}

.github/workflows/crashlytics.yml

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,7 @@ jobs:
4747
uses: ./.github/workflows/common_quickstart.yml
4848
with:
4949
product: Crashlytics
50-
is_legacy: true
51-
setup_command: |
52-
scripts/setup_quickstart.sh crashlytics
53-
mkdir quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
54-
# Set the deployed pod location of run and upload-symbols with the development pod version.
55-
cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
56-
cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
50+
setup_command: scripts/setup_quickstart_spm.sh crashlytics
5751
plist_src_path: scripts/gha-encrypted/qs-crashlytics.plist.gpg
5852
plist_dst_path: quickstart-ios/crashlytics/GoogleService-Info.plist
5953
secrets:
@@ -76,20 +70,12 @@ jobs:
7670
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
7771
# - name: Setup quickstart
7872
# run: scripts/setup_quickstart.sh crashlytics
79-
# env:
80-
# LEGACY: true
8173
# - name: Install Secret GoogleService-Info.plist
8274
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \
8375
# quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret"
8476
# - name: Build swift quickstart
8577
# run: |
86-
# mkdir quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
87-
# # Set the deployed pod location of run and upload-symbols with the development pod version.
88-
# cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
89-
# cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
9078
# ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Crashlytics swift)
91-
# env:
92-
# LEGACY: true
9379
# - id: ftl_test
9480
# uses: FirebaseExtended/github-actions/[email protected]
9581
# with:

.github/workflows/database.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ jobs:
7474
uses: ./.github/workflows/common_quickstart.yml
7575
with:
7676
product: Database
77-
is_legacy: false
78-
setup_command: QUICKSTART_BRANCH=nc/quickstarts scripts/setup_quickstart_spm.sh database
77+
setup_command: scripts/setup_quickstart_spm.sh database
7978
plist_src_path: scripts/gha-encrypted/qs-database.plist.gpg
8079
plist_dst_path: quickstart-ios/database/GoogleService-Info.plist
8180
run_tests: false

.github/workflows/firestore.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -605,8 +605,7 @@ jobs:
605605
# uses: ./.github/workflows/common_quickstart.yml
606606
# with:
607607
# product: Firestore
608-
# is_legacy: true
609-
# setup_command: QUICKSTART_BRANCH=nc/quickstarts scripts/setup_quickstart_spm.sh firestore
608+
# setup_command: scripts/setup_quickstart_spm.sh firestore
610609
# plist_src_path: scripts/gha-encrypted/qs-firestore.plist.gpg
611610
# plist_dst_path: quickstart-ios/firestore/GoogleService-Info.plist
612611
# run_tests: false

.github/workflows/functions.yml

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,7 @@ jobs:
5151
with:
5252
target: FirebaseFunctionsUnit
5353

54-
# TODO: The legacy quickstart uses material which doesn't build on Xcode 15.
55-
# quickstart:
56-
# uses: ./.github/workflows/common_quickstart.yml
57-
# strategy:
58-
# matrix:
59-
# quickstart_type: [objc, swift]
60-
# with:
61-
# product: Functions
62-
# is_legacy: true
63-
# setup_command: |
64-
# scripts/setup_quickstart.sh functions
65-
# sed -i '' 's/REVERSED_CLIENT_ID/com.googleusercontent.apps.1025801074639-6p6ebi8amuklcjrto20gvpe295smm8u6/' quickstart-ios/functions/LegacyFunctionsQuickstart/FunctionsExample/Info.plist
66-
# plist_src_path: scripts/gha-encrypted/qs-functions.plist.gpg
67-
# plist_dst_path: quickstart-ios/functions/GoogleService-Info.plist
68-
# quickstart_type: ${{ matrix.quickstart_type }}
69-
# secrets:
70-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
54+
# TODO(ncooke3): Add a Functions quickstart test.
7155

7256
# quickstart-ftl-cron-only:
7357
# # Don't run on private repo

.github/workflows/inappmessaging.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ jobs:
7676
uses: ./.github/workflows/common_quickstart.yml
7777
with:
7878
product: InAppMessaging
79-
is_legacy: false
80-
setup_command: QUICKSTART_BRANCH=nc/quickstarts scripts/setup_quickstart_spm.sh inappmessaging
79+
setup_command: scripts/setup_quickstart_spm.sh inappmessaging
8180
plist_src_path: scripts/gha-encrypted/qs-inappmessaging.plist.gpg
8281
plist_dst_path: quickstart-ios/inappmessaging/GoogleService-Info.plist
8382
secrets:

.github/workflows/installations.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ jobs:
5353
uses: ./.github/workflows/common_quickstart.yml
5454
with:
5555
product: Installations
56-
is_legacy: false
57-
setup_command: QUICKSTART_BRANCH=nc/quickstarts scripts/setup_quickstart_spm.sh installations
56+
setup_command: scripts/setup_quickstart_spm.sh installations
5857
plist_src_path: scripts/gha-encrypted/Installations/GoogleService-Info.plist.gpg
5958
plist_dst_path: quickstart-ios/installations/GoogleService-Info.plist
6059
secrets:

.github/workflows/messaging.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ jobs:
8585
uses: ./.github/workflows/common_quickstart.yml
8686
with:
8787
product: Messaging
88-
is_legacy: false
89-
setup_command: QUICKSTART_BRANCH=nc/quickstarts scripts/setup_quickstart_spm.sh messaging
88+
setup_command: scripts/setup_quickstart_spm.sh messaging
9089
plist_src_path: scripts/gha-encrypted/qs-messaging.plist.gpg
9190
plist_dst_path: quickstart-ios/messaging/GoogleService-Info.plist
9291
run_tests: false

0 commit comments

Comments
 (0)