Skip to content

Commit 49adb9d

Browse files
committed
Merge branch 'main' into ah/ai-unsupported-part-data
2 parents 68f0ae5 + 1ec81a9 commit 49adb9d

File tree

4 files changed

+9
-17
lines changed

4 files changed

+9
-17
lines changed

.github/workflows/auth.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
product: Authentication
9999
is_legacy: false
100100
setup_command: scripts/setup_quickstart.sh authentication
101-
plist_src_path: scripts/gha-encrypted/qs-auth.plist.gpg
101+
plist_src_path: scripts/gha-encrypted/qs-authentication.plist.gpg
102102
plist_dst_path: quickstart-ios/authentication/GoogleService-Info.plist
103103
run_tests: false
104104
secrets:
@@ -122,7 +122,7 @@ jobs:
122122
# - name: Setup quickstart
123123
# run: scripts/setup_quickstart.sh authentication
124124
# - name: Install Secret GoogleService-Info.plist
125-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-auth.plist.gpg \
125+
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-authentication.plist.gpg \
126126
# quickstart-ios/authentication/GoogleService-Info.plist "$plist_secret"
127127
# - name: Build swift quickstart
128128
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Authentication)

.github/workflows/prerelease.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -311,21 +311,13 @@ jobs:
311311
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
312312
- name: Xcode
313313
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
314-
- name: Get lowercase product name.
315-
id: lowercase_product
316-
run: |
317-
lowercase_product=$(echo "${{ matrix.product }}" | tr '[:upper:]' '[:lower:]')
318-
echo "lowercase_product=$lowercase_product" >> $GITHUB_OUTPUT
319314
- name: Setup testing repo and quickstart
320-
run: |
321-
lowercase_product=${{ steps.lowercase_product.outputs.lowercase_product }}
322-
BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh $lowercase_product prerelease_testing
315+
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh ${{ matrix.product }} prerelease_testing
323316
- name: Install Secret GoogleService-Info.plist
324317
run: |
325-
lowercase_product = ${{ steps.lowercase_product.outputs.lowercase_product }}
326318
scripts/decrypt_gha_secret.sh \
327-
scripts/gha-encrypted/qs-$lowercase_product.plist.gpg \
328-
quickstart-ios/$lowercase_product/GoogleService-Info.plist \
319+
scripts/gha-encrypted/qs-${{ matrix.product }}.plist.gpg \
320+
quickstart-ios/${{ matrix.product }}/GoogleService-Info.plist \
329321
"$plist_secret"
330322
- name: Run setup command, if needed.
331323
if: matrix.setup_command != ''
@@ -349,9 +341,9 @@ jobs:
349341
# Failure sequence to upload artifact.
350342
- name: Remove data before upload.
351343
if: ${{ failure() }}
352-
run: scripts/remove_data.sh ${{ steps.lowercase_product.outputs.lowercase_product }}
344+
run: scripts/remove_data.sh ${{ matrix.product }}
353345
- uses: actions/upload-artifact@v4
354346
if: ${{ failure() }}
355347
with:
356-
name: quickstart_artifacts_${{ steps.lowercase_product.outputs.lowercase_product }}
348+
name: quickstart_artifacts_${{ matrix.product }}
357349
path: quickstart-ios/

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ jobs:
201201
- name: Setup testing repo and quickstart
202202
run: BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh Authentication nightly_release_testing
203203
- name: Install Secret GoogleService-Info.plist
204-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-auth.plist.gpg \
204+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-authentication.plist.gpg \
205205
quickstart-ios/authentication/GoogleService-Info.plist "$plist_secret"
206206
- name: Test swift quickstart
207207
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Authentication false)

.github/workflows/zip.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ jobs:
196196
"${HOME}"/ios_frameworks/Firebase/FirebaseAuth/* \
197197
"${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
198198
- name: Install Secret GoogleService-Info.plist
199-
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-auth.plist.gpg \
199+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-authentication.plist.gpg \
200200
quickstart-ios/authentication/GoogleService-Info.plist "$plist_secret"
201201
- name: Test Swift Quickstart
202202
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")

0 commit comments

Comments
 (0)