Skip to content

Commit 1d68365

Browse files
ncooke3ncooke3
committed
workflow refactors
1 parent b620b61 commit 1d68365

File tree

7 files changed

+15
-81
lines changed

7 files changed

+15
-81
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
# python-version: '3.11'
6767
# - name: Setup quickstart
6868
# env:
69-
# LEGACY: true
7069
# run: scripts/setup_quickstart.sh abtesting
7170
# - name: Install Secret GoogleService-Info.plist
7271
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
@@ -75,7 +74,6 @@ jobs:
7574
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
7675
# - name: Build swift quickstart
7776
# env:
78-
# LEGACY: true
7977
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh ABTesting)
8078
# - id: ftl_test
8179
# uses: FirebaseExtended/github-actions/[email protected]

‎.github/workflows/crashlytics.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,20 +70,12 @@ jobs:
7070
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
7171
# - name: Setup quickstart
7272
# run: scripts/setup_quickstart.sh crashlytics
73-
# env:
74-
# LEGACY: true
7573
# - name: Install Secret GoogleService-Info.plist
7674
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \
7775
# quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret"
7876
# - name: Build swift quickstart
7977
# run: |
80-
# mkdir quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
81-
# # Set the deployed pod location of run and upload-symbols with the development pod version.
82-
# cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
83-
# cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
8478
# ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Crashlytics swift)
85-
# env:
86-
# LEGACY: true
8779
# - id: ftl_test
8880
# uses: FirebaseExtended/github-actions/[email protected]
8981
# with:

‎.github/workflows/functions.yml‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,22 +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-
# setup_command: |
63-
# scripts/setup_quickstart.sh functions
64-
# sed -i '' 's/REVERSED_CLIENT_ID/com.googleusercontent.apps.1025801074639-6p6ebi8amuklcjrto20gvpe295smm8u6/' quickstart-ios/functions/LegacyFunctionsQuickstart/FunctionsExample/Info.plist
65-
# plist_src_path: scripts/gha-encrypted/qs-functions.plist.gpg
66-
# plist_dst_path: quickstart-ios/functions/GoogleService-Info.plist
67-
# quickstart_type: ${{ matrix.quickstart_type }}
68-
# secrets:
69-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
54+
# TODO(ncooke3): Add a Functions quickstart test.
7055

7156
# quickstart-ftl-cron-only:
7257
# # Don't run on private repo

‎.github/workflows/prerelease.yml‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,6 @@ jobs:
223223
# env:
224224
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
225225
# botaccess: ${{ secrets.PRERELEASE_TESTING_PAT }}
226-
# LEGACY: true
227226
# # TODO: The functions quickstart uses Material which isn't supported by Xcode 15
228227
# runs-on: macos-12
229228
# steps:
@@ -263,7 +262,6 @@ jobs:
263262
- product: Performance
264263
run_tests: true
265264
- product: Storage
266-
is_legacy: true
267265
run_tests: true
268266
- product: Config
269267
run_tests: true
@@ -278,20 +276,12 @@ jobs:
278276
- product: Authentication
279277
run_tests: false
280278
- product: Crashlytics
281-
is_legacy: true
282279
run_tests: true
283-
setup_command: |
284-
mkdir -p quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
285-
# Set the deployed pod location of run and upload-symbols with the development pod version.
286-
cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
287-
cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
288280
- product: ABTesting
289-
is_legacy: true
290281
run_tests: true
291282
env:
292283
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
293284
botaccess: ${{ secrets.PRERELEASE_TESTING_PAT }}
294-
LEGACY: ${{ matrix.is_legacy && true || '' }}
295285
runs-on: macos-15
296286
steps:
297287
- uses: actions/checkout@v4
@@ -318,10 +308,10 @@ jobs:
318308
command: scripts/test_quickstart.sh ${{ matrix.product }} ${{ matrix.run_tests }}
319309
# Failure sequence to upload artifact.
320310
- name: Remove data before upload.
321-
if: ${{ failure() }}
311+
# if: ${{ failure() }}
322312
run: scripts/remove_data.sh ${{ matrix.product }}
323-
- uses: actions/upload-artifact@v4
324-
if: ${{ failure() }}
325-
with:
326-
name: quickstart_artifacts_${{ matrix.product }}
327-
path: quickstart-ios/
313+
# - uses: actions/upload-artifact@v4
314+
# if: ${{ failure() }}
315+
# with:
316+
# name: quickstart_artifacts_${{ matrix.product }}
317+
# path: quickstart-ios/

‎.github/workflows/release.yml‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ jobs:
164164
run_tests: true
165165
- product: Storage
166166
run_tests: true
167-
is_legacy: true
168167
- product: Config
169168
run_tests: true
170169
- product: Messaging
@@ -179,19 +178,11 @@ jobs:
179178
run_tests: false
180179
- product: Crashlytics
181180
run_tests: true
182-
is_legacy: true
183-
setup_command: |
184-
mkdir -p quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
185-
# Set the deployed pod location of run and upload-symbols with the development pod version.
186-
cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
187-
cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
188181
- product: ABTesting
189182
run_tests: true
190-
is_legacy: true
191183
env:
192184
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
193185
botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
194-
LEGACY: ${{ matrix.is_legacy && true || '' }}
195186
runs-on: macos-15
196187
steps:
197188
- uses: actions/checkout@v4
@@ -215,13 +206,13 @@ jobs:
215206
retry_wait_seconds: 120
216207
command: scripts/test_quickstart.sh ${{ matrix.product }} ${{ matrix.run_tests }}
217208
- name: Remove data before upload
218-
if: ${{ failure() }}
209+
# if: ${{ failure() }}
219210
run: scripts/remove_data.sh ${{ matrix.product }}
220-
- uses: actions/upload-artifact@v4
221-
if: ${{ failure() }}
222-
with:
223-
name: quickstart_artifacts_${{ matrix.product }}
224-
path: quickstart-ios/
211+
# - uses: actions/upload-artifact@v4
212+
# if: ${{ failure() }}
213+
# with:
214+
# name: quickstart_artifacts_${{ matrix.product }}
215+
# path: quickstart-ios/
225216

226217
# TODO: The functions quickstart uses Material which isn't supported by Xcode 15
227218
# functions_quickstart:
@@ -231,7 +222,6 @@ jobs:
231222
# env:
232223
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
233224
# botaccess: ${{ secrets.RELEASE_TESTING_PAT }}
234-
# LEGACY: true
235225
# runs-on: macos-12
236226
# steps:
237227
# - uses: actions/checkout@v4

‎.github/workflows/storage.yml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ jobs:
9595
# if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
9696
# env:
9797
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
98-
# LEGACY: true
9998
# runs-on: macos-15
10099
# steps:
101100
# - uses: actions/checkout@v4

‎.github/workflows/zip.yml‎

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: zip
22

3+
# TODO(ncooke3): Add FirebaseAI test.
4+
35
permissions:
46
actions: read
57
contents: read
@@ -147,8 +149,6 @@ jobs:
147149
find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
148150
- uses: actions/checkout@v4
149151
- name: Setup quickstart
150-
env:
151-
LEGACY: true
152152
run: SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
153153
"${HOME}"/ios_frameworks/Firebase/FirebaseRemoteConfig/* \
154154
"${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/FirebaseCore.xcframework \
@@ -160,12 +160,8 @@ jobs:
160160
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
161161
quickstart-ios/abtesting/GoogleService-Info.plist "$plist_secret"
162162
- name: Test Quickstart
163-
env:
164-
LEGACY: true
165163
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
166164
- name: Remove data before upload
167-
env:
168-
LEGACY: true
169165
if: ${{ failure() }}
170166
run: scripts/remove_data.sh abtesting
171167
- uses: actions/upload-artifact@v4
@@ -306,8 +302,6 @@ jobs:
306302
find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
307303
- uses: actions/checkout@v4
308304
- name: Setup quickstart
309-
env:
310-
LEGACY: true
311305
run: |
312306
SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
313307
"${HOME}"/ios_frameworks/Firebase/FirebaseCrashlytics/* \
@@ -327,17 +321,13 @@ jobs:
327321
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \
328322
quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret"
329323
- name: Test Quickstart
330-
env:
331-
LEGACY: true
332324
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
333325
# TODO(#8057): Restore Swift Quickstart
334326
# - name: Test Swift Quickstart
335327
# env:
336328
# LEGACY: true
337329
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}" swift)
338330
- name: Remove data before upload
339-
env:
340-
LEGACY: true
341331
if: ${{ failure() }}
342332
run: scripts/remove_data.sh crashlytics
343333
- uses: actions/upload-artifact@v4
@@ -625,30 +615,20 @@ jobs:
625615
find "${GITHUB_WORKSPACE}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
626616
- uses: actions/checkout@v4
627617
- name: Setup quickstart
628-
env:
629-
LEGACY: true
630618
run: SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
631619
"${HOME}"/ios_frameworks/Firebase/FirebaseStorage/* \
632620
"${HOME}"/ios_frameworks/Firebase/FirebaseAuth/* \
633621
"${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
634622
- name: Setup swift quickstart
635-
env:
636-
LEGACY: true
637623
run: SAMPLE="$SDK" TARGET="${SDK}ExampleSwift" scripts/setup_quickstart_framework.sh
638624
- name: Install Secret GoogleService-Info.plist
639625
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
640626
quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
641627
- name: Test Quickstart
642-
env:
643-
LEGACY: true
644628
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
645629
- name: Test Swift Quickstart
646-
env:
647-
LEGACY: true
648630
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}" swift)
649631
- name: Remove data before upload
650-
env:
651-
LEGACY: true
652632
if: ${{ failure() }}
653633
run: scripts/remove_data.sh storage
654634
- uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)