From a15cfcb6a67efcfda6392c2a9cfaf565646f29e9 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Dec 2025 13:58:29 -0500 Subject: [PATCH 1/5] chore: remove CP-based setup_quickstart.sh --- scripts/setup_quickstart.sh | 74 ------------------------------------- 1 file changed, 74 deletions(-) delete mode 100755 scripts/setup_quickstart.sh diff --git a/scripts/setup_quickstart.sh b/scripts/setup_quickstart.sh deleted file mode 100755 index 840b1eaebdc..00000000000 --- a/scripts/setup_quickstart.sh +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright 2019 Google -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - - -# Script to run in a CI `before_install` phase to setup the quickstart repo -# so that it can be used for integration testing. - -set -xeuo pipefail - -scripts_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" -root_dir="$(dirname "$scripts_dir")" - -$scripts_dir/setup_bundler.sh - -# Source function to check if CI secrets are available. -source $scripts_dir/check_secrets.sh - -SAMPLE=$1 - -RELEASE_TESTING=${2-} - -WORKSPACE_DIR="quickstart-ios/${SAMPLE}" -PODFILE="quickstart-ios/"$SAMPLE"/Podfile" - -if [[ ! -z "${LEGACY:-}" ]]; then - WORKSPACE_DIR="quickstart-ios/${SAMPLE}/Legacy${SAMPLE}Quickstart" - PODFILE="quickstart-ios/"$SAMPLE"/Legacy${SAMPLE}Quickstart/Podfile" -fi - -gem install xcpretty - -# Installations is the only quickstart that doesn't need a real -# GoogleService-Info.plist for its tests. -if check_secrets || [[ ${SAMPLE} == "installations" ]]; then - - # Specify repo so the Firebase module and header can be found in a - # development pod install. This is needed for the `pod install` command. - export FIREBASE_POD_REPO_FOR_DEV_POD=`pwd` - - git clone https://github.com/firebase/quickstart-ios.git - - $scripts_dir/localize_podfile.swift "$WORKSPACE_DIR"/Podfile "$RELEASE_TESTING" - if [ "$RELEASE_TESTING" == "nightly_release_testing" ]; then - set +x - sed -i "" '1i\'$'\n'"source 'https://github.com/Firebase/SpecsReleasing.git'"$'\n' "$PODFILE" - set -x - echo "Source of Podfile for nightly release testing is updated." - fi - if [ "$RELEASE_TESTING" == "prerelease_testing" ]; then - set +x - sed -i "" '1i\'$'\n'"source 'https://github.com/Firebase/SpecsTesting.git'"$'\n' "$PODFILE" - set -x - echo "Source of Podfile for prerelease testing is updated." - fi - cd "${WORKSPACE_DIR}" - - # To test a branch, uncomment the following line - # git checkout {BRANCH_NAME} - - bundle update --bundler - bundle install - pod update -fi From 1f0a4a558460ed25820e2a0d0a9afbdf3e9d9d4c Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Dec 2025 13:58:59 -0500 Subject: [PATCH 2/5] move setup_quickstart_spm to setup_quickstart --- scripts/{setup_quickstart_spm.sh => setup_quickstart.sh} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename scripts/{setup_quickstart_spm.sh => setup_quickstart.sh} (100%) diff --git a/scripts/setup_quickstart_spm.sh b/scripts/setup_quickstart.sh similarity index 100% rename from scripts/setup_quickstart_spm.sh rename to scripts/setup_quickstart.sh From 54d05ee2a17923701936d618a4eae1e6cde00b93 Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Dec 2025 14:00:11 -0500 Subject: [PATCH 3/5] finish migration --- .github/workflows/abtesting.yml | 4 ++-- .github/workflows/auth.yml | 2 +- .github/workflows/crashlytics.yml | 4 ++-- .github/workflows/database.yml | 2 +- .github/workflows/firestore.yml | 2 +- .github/workflows/inappmessaging.yml | 2 +- .github/workflows/installations.yml | 4 ++-- .github/workflows/messaging.yml | 4 ++-- .github/workflows/performance.yml | 4 ++-- .github/workflows/prerelease.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/remoteconfig.yml | 2 +- .github/workflows/storage.yml | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/abtesting.yml b/.github/workflows/abtesting.yml index ab2b77aa8d6..f5a2d6f81c0 100644 --- a/.github/workflows/abtesting.yml +++ b/.github/workflows/abtesting.yml @@ -45,7 +45,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: ABTesting - setup_command: scripts/setup_quickstart_spm.sh abtesting + setup_command: scripts/setup_quickstart.sh abtesting plist_src_path: scripts/gha-encrypted/qs-abtesting.plist.gpg plist_dst_path: quickstart-ios/abtesting/GoogleService-Info.plist secrets: @@ -69,7 +69,7 @@ jobs: with: python-version: '3.11' - name: Setup quickstart - run: scripts/setup_quickstart_spm.sh abtesting + run: scripts/setup_quickstart.sh abtesting - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \ quickstart-ios/abtesting/GoogleService-Info.plist "$plist_secret" diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml index fd9cce9f5be..4a0f8a36547 100644 --- a/.github/workflows/auth.yml +++ b/.github/workflows/auth.yml @@ -97,7 +97,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Authentication - setup_command: scripts/setup_quickstart_spm.sh authentication + setup_command: scripts/setup_quickstart.sh authentication plist_src_path: scripts/gha-encrypted/qs-authentication.plist.gpg plist_dst_path: quickstart-ios/authentication/GoogleService-Info.plist run_tests: false diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index 341da63a063..79288931bc6 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -48,7 +48,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Crashlytics - setup_command: scripts/setup_quickstart_spm.sh crashlytics + setup_command: scripts/setup_quickstart.sh crashlytics plist_src_path: scripts/gha-encrypted/qs-crashlytics.plist.gpg plist_dst_path: quickstart-ios/crashlytics/GoogleService-Info.plist secrets: @@ -74,7 +74,7 @@ jobs: - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup quickstart - run: scripts/setup_quickstart_spm.sh crashlytics + run: scripts/setup_quickstart.sh crashlytics - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \ quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret" diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index b75ecb9f8a3..7c99accf44b 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -74,7 +74,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Database - setup_command: scripts/setup_quickstart_spm.sh database + setup_command: scripts/setup_quickstart.sh database plist_src_path: scripts/gha-encrypted/qs-database.plist.gpg plist_dst_path: quickstart-ios/database/GoogleService-Info.plist run_tests: false diff --git a/.github/workflows/firestore.yml b/.github/workflows/firestore.yml index 4c3e9726425..1c93b975311 100644 --- a/.github/workflows/firestore.yml +++ b/.github/workflows/firestore.yml @@ -605,7 +605,7 @@ jobs: # uses: ./.github/workflows/common_quickstart.yml # with: # product: Firestore - # setup_command: scripts/setup_quickstart_spm.sh firestore + # setup_command: scripts/setup_quickstart.sh firestore # plist_src_path: scripts/gha-encrypted/qs-firestore.plist.gpg # plist_dst_path: quickstart-ios/firestore/GoogleService-Info.plist # run_tests: false diff --git a/.github/workflows/inappmessaging.yml b/.github/workflows/inappmessaging.yml index b7ace6a847a..c4ef6f675b9 100644 --- a/.github/workflows/inappmessaging.yml +++ b/.github/workflows/inappmessaging.yml @@ -76,7 +76,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: InAppMessaging - setup_command: scripts/setup_quickstart_spm.sh inappmessaging + setup_command: scripts/setup_quickstart.sh inappmessaging plist_src_path: scripts/gha-encrypted/qs-inappmessaging.plist.gpg plist_dst_path: quickstart-ios/inappmessaging/GoogleService-Info.plist run_tests: false diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml index 6037a762d2c..140274967e2 100644 --- a/.github/workflows/installations.yml +++ b/.github/workflows/installations.yml @@ -53,7 +53,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Installations - setup_command: scripts/setup_quickstart_spm.sh installations + setup_command: scripts/setup_quickstart.sh installations plist_src_path: scripts/gha-encrypted/Installations/GoogleService-Info.plist.gpg plist_dst_path: quickstart-ios/installations/GoogleService-Info.plist secrets: @@ -76,7 +76,7 @@ jobs: - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup quickstart - run: scripts/setup_quickstart_spm.sh installations + run: scripts/setup_quickstart.sh installations - name: Copy mock plist run: cp quickstart-ios/mock-GoogleService-Info.plist quickstart-ios/installations/GoogleService-Info.plist - name: Build quickstart diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index 2939d779594..86af0505687 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -85,7 +85,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Messaging - setup_command: scripts/setup_quickstart_spm.sh messaging + setup_command: scripts/setup_quickstart.sh messaging plist_src_path: scripts/gha-encrypted/qs-messaging.plist.gpg plist_dst_path: quickstart-ios/messaging/GoogleService-Info.plist run_tests: false @@ -105,7 +105,7 @@ jobs: - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup quickstart - run: scripts/setup_quickstart_spm.sh messaging + run: scripts/setup_quickstart.sh messaging - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-messaging.plist.gpg \ quickstart-ios/messaging/GoogleService-Info.plist "$plist_secret" diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index d5b39b13b39..2eaef8ca98e 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -82,7 +82,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Performance - setup_command: scripts/setup_quickstart_spm.sh performance + setup_command: scripts/setup_quickstart.sh performance plist_src_path: scripts/gha-encrypted/qs-performance.plist.gpg plist_dst_path: quickstart-ios/performance/GoogleService-Info.plist secrets: @@ -104,7 +104,7 @@ jobs: - name: Install xcpretty run: gem install xcpretty - name: Setup quickstart - run: scripts/setup_quickstart_spm.sh performance + run: scripts/setup_quickstart.sh performance - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-performance.plist.gpg \ quickstart-ios/performance/GoogleService-Info.plist "$plist_secret" diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index e6575f9a614..7a9537ecac6 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -101,7 +101,7 @@ jobs: - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup testing repo and quickstart - run: scripts/setup_quickstart_spm.sh ${{ matrix.product }} prerelease_testing + run: scripts/setup_quickstart.sh ${{ matrix.product }} prerelease_testing - name: Install Secret GoogleService-Info.plist run: | scripts/decrypt_gha_secret.sh \ diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 0a3d4842b53..3a191c3d473 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -99,7 +99,7 @@ jobs: - name: Prereqs run: gem install xcpretty - name: Setup testing repo and quickstart - run: scripts/setup_quickstart_spm.sh ${{ matrix.product }} nightly_release_testing + run: scripts/setup_quickstart.sh ${{ matrix.product }} nightly_release_testing - name: Install Secret GoogleService-Info.plist run: | scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-${{ matrix.product }}.plist.gpg \ diff --git a/.github/workflows/remoteconfig.yml b/.github/workflows/remoteconfig.yml index 36ba73ed473..2293aaa9283 100644 --- a/.github/workflows/remoteconfig.yml +++ b/.github/workflows/remoteconfig.yml @@ -94,7 +94,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Config - setup_command: scripts/setup_quickstart_spm.sh config + setup_command: scripts/setup_quickstart.sh config plist_src_path: scripts/gha-encrypted/qs-config.plist.gpg plist_dst_path: quickstart-ios/config/GoogleService-Info.plist secrets: diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 9aae03de131..8155d718928 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -83,7 +83,7 @@ jobs: uses: ./.github/workflows/common_quickstart.yml with: product: Storage - setup_command: scripts/setup_quickstart_spm.sh storage + setup_command: scripts/setup_quickstart.sh storage plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist run_tests: false From b8f0573b9835e2ae213dd53f4f1946f017b43368 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:23:53 -0500 Subject: [PATCH 4/5] fix: messaging missing iOS sim flake --- .github/workflows/messaging.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index 86af0505687..afeecc7330d 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -140,6 +140,8 @@ jobs: - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer + - name: Install iOS simulators in case they are missing. + run: sudo xcodebuild -downloadPlatform iOS - name: Setup Bundler run: scripts/setup_bundler.sh - name: Install Secret GoogleService-Info.plist From 79e5ea6bde0b035990e3d3b867926604542843cf Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 16 Dec 2025 17:27:04 -0500 Subject: [PATCH 5/5] revert for now --- .github/workflows/messaging.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index afeecc7330d..86af0505687 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -140,8 +140,6 @@ jobs: - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - - name: Install iOS simulators in case they are missing. - run: sudo xcodebuild -downloadPlatform iOS - name: Setup Bundler run: scripts/setup_bundler.sh - name: Install Secret GoogleService-Info.plist