Skip to content

Commit 49b411d

Browse files
paulb777paulb777
authored
Use the v9 quickstart branch until the v9 release (#9648)
1 parent 5973901 commit 49b411d

File tree

4 files changed

+47
-46
lines changed

4 files changed

+47
-46
lines changed

‎.github/workflows/functions.yml‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,31 +82,30 @@ jobs:
8282
- name: Unit Tests
8383
run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFunctionsUnit ${{ matrix.target }} spm
8484

85-
# TODO: Restore Quickstart when ported for Firebase 9.
86-
# quickstart:
87-
# # Don't run on private repo unless it is a PR.
88-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
89-
# env:
90-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
91-
# signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
92-
# LEGACY: true
93-
# runs-on: macos-11
85+
quickstart:
86+
# Don't run on private repo unless it is a PR.
87+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
88+
env:
89+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
90+
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
91+
LEGACY: true
92+
runs-on: macos-11
9493

95-
# steps:
96-
# - uses: actions/checkout@v2
97-
# - name: Setup quickstart
98-
# run: scripts/setup_quickstart.sh functions
99-
# - name: install secret googleservice-info.plist
100-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-functions.plist.gpg \
101-
# quickstart-ios/functions/GoogleService-Info.plist "$plist_secret"
102-
# - name: Setup custom URL scheme
103-
# run: sed -i '' 's/REVERSED_CLIENT_ID/com.googleusercontent.apps.1025801074639-6p6ebi8amuklcjrto20gvpe295smm8u6/' quickstart-ios/functions/LegacyFunctionsQuickstart/FunctionsExample/Info.plist
104-
# - name: Test objc quickstart
105-
# run: ([ -z $plist_secret ] ||
106-
# scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Functions true)
107-
# - name: Test swift quickstart
108-
# run: ([ -z $plist_secret ] ||
109-
# scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Functions true swift)
94+
steps:
95+
- uses: actions/checkout@v2
96+
- name: Setup quickstart
97+
run: scripts/setup_quickstart.sh functions
98+
- name: install secret googleservice-info.plist
99+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-functions.plist.gpg \
100+
quickstart-ios/functions/GoogleService-Info.plist "$plist_secret"
101+
- name: Setup custom URL scheme
102+
run: sed -i '' 's/REVERSED_CLIENT_ID/com.googleusercontent.apps.1025801074639-6p6ebi8amuklcjrto20gvpe295smm8u6/' quickstart-ios/functions/LegacyFunctionsQuickstart/FunctionsExample/Info.plist
103+
- name: Test objc quickstart
104+
run: ([ -z $plist_secret ] ||
105+
scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Functions true)
106+
- name: Test swift quickstart
107+
run: ([ -z $plist_secret ] ||
108+
scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Functions true swift)
110109

111110
functions-cron-only:
112111
# Don't run on private repo.

‎.github/workflows/storage.yml‎

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,26 +91,25 @@ jobs:
9191
- name: Setup project and Build for Catalyst
9292
run: scripts/test_catalyst.sh FirebaseStorageInternal test FirebaseStorageInternal-Unit-unit
9393

94-
# TODO: Restore Quickstart when ported for Firebase 9.
95-
# quickstart:
96-
# # Don't run on private repo unless it is a PR.
97-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
98-
# env:
99-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
100-
# signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
101-
# LEGACY: true
102-
# runs-on: macos-11
103-
# steps:
104-
# - uses: actions/checkout@v2
105-
# - name: Setup quickstart
106-
# run: scripts/setup_quickstart.sh storage
107-
# - name: Install Secret GoogleService-Info.plist
108-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
109-
# quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
110-
# - name: Test objc quickstart
111-
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true)
112-
# - name: Test swift quickstart
113-
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true swift)
94+
quickstart:
95+
# Don't run on private repo unless it is a PR.
96+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
97+
env:
98+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
99+
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
100+
LEGACY: true
101+
runs-on: macos-11
102+
steps:
103+
- uses: actions/checkout@v2
104+
- name: Setup quickstart
105+
run: scripts/setup_quickstart.sh storage
106+
- name: Install Secret GoogleService-Info.plist
107+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \
108+
quickstart-ios/storage/GoogleService-Info.plist "$plist_secret"
109+
- name: Test objc quickstart
110+
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true)
111+
- name: Test swift quickstart
112+
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true swift)
114113

115114
pod-lib-lint:
116115
# Don't run on private repo unless it is a PR.

‎scripts/setup_quickstart.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,9 @@ if check_secrets || [[ ${SAMPLE} == "installations" ]]; then
4747
# development pod install. This is needed for the `pod install` command.
4848
export FIREBASE_POD_REPO_FOR_DEV_POD=`pwd`
4949

50-
git clone https://github.com/firebase/quickstart-ios.git
50+
#TODO: Delete the branch option after the 9.0 release.
51+
git clone --branch v9 https://github.com/firebase/quickstart-ios.git
52+
5153
$scripts_dir/localize_podfile.swift "$WORKSPACE_DIR"/Podfile "$RELEASE_TESTING"
5254
if [ "$RELEASE_TESTING" == "nightly_release_testing" ]; then
5355
set +x

‎scripts/setup_quickstart_framework.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ set -ex
1616

1717
REPO=`pwd`
1818
if [ ! -d "quickstart-ios" ]; then
19-
git clone https://github.com/firebase/quickstart-ios.git
19+
#TODO: Delete the branch option after the 9.0 release.
20+
git clone --branch v9 https://github.com/firebase/quickstart-ios.git
2021
fi
2122
QS_SCRIPTS="${REPO}"/quickstart-ios/scripts
2223
cd quickstart-ios/"${SAMPLE}"

0 commit comments

Comments
 (0)