Skip to content

Commit c7ddad3

Browse files
paulb777paulb777
authored
Update more workflows for new crashlytics qs location (#8338)
1 parent dd3d8f7 commit c7ddad3

File tree

7 files changed

+61
-22
lines changed

7 files changed

+61
-22
lines changed

‎.github/workflows/prerelease.yml‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,8 @@ jobs:
179179
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
180180
bot-access.txt "$bot_token_secret"
181181
- name: Setup testing repo and quickstart
182+
env:
183+
LEGACY: true
182184
run: |
183185
botaccess=`cat bot-access.txt`
184186
BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh Crashlytics prerelease_testing
@@ -189,15 +191,21 @@ jobs:
189191
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FIREGSignInInfo.h.gpg \
190192
quickstart-ios/TestUtils/FIREGSignInInfo.h "$signin_secret"
191193
- name: Test objc quickstart
194+
env:
195+
LEGACY: true
192196
run: |
193-
mkdir -p quickstart-ios/crashlytics/Pods/FirebaseCrashlytics
197+
mkdir -p quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
194198
# Set the deployed pod location of run and upload-symbols with the development pod version.
195-
cp Crashlytics/run quickstart-ios/crashlytics/Pods/FirebaseCrashlytics/
196-
cp Crashlytics/upload-symbols quickstart-ios/crashlytics/Pods/FirebaseCrashlytics/
199+
cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
200+
cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
197201
([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Crashlytics)
198202
- name: Test swift quickstart
203+
env:
204+
LEGACY: true
199205
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Crashlytics swift)
200206
- name: Remove data before upload
207+
env:
208+
LEGACY: true
201209
run: scripts/remove_data.sh crashlytics release_testing
202210
- uses: actions/upload-artifact@v2
203211
if: ${{ failure() }}

‎.github/workflows/release.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'scripts/release_testing_setup.sh'
7+
- '.github/workflows/release.yml'
78
workflow_dispatch:
89
schedule:
910
# Run every day at 11pm (PST) - cron uses UTC times
@@ -131,6 +132,8 @@ jobs:
131132
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/bot-access.txt.gpg \
132133
bot-access.txt "$bot_token_secret"
133134
- name: Setup testing repo and quickstart
135+
env:
136+
LEGACY: true
134137
run: |
135138
botaccess=`cat bot-access.txt`
136139
BOT_TOKEN="${botaccess}" scripts/setup_quickstart.sh Crashlytics nightly_release_testing
@@ -141,15 +144,21 @@ jobs:
141144
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FIREGSignInInfo.h.gpg \
142145
quickstart-ios/TestUtils/FIREGSignInInfo.h "$signin_secret"
143146
- name: Test objc quickstart
147+
env:
148+
LEGACY: true
144149
run: |
145-
mkdir -p quickstart-ios/crashlytics/Pods/FirebaseCrashlytics
150+
mkdir -p quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics
146151
# Set the deployed pod location of run and upload-symbols with the development pod version.
147-
cp Crashlytics/run quickstart-ios/crashlytics/Pods/FirebaseCrashlytics/
148-
cp Crashlytics/upload-symbols quickstart-ios/crashlytics/Pods/FirebaseCrashlytics/
152+
cp Crashlytics/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
153+
cp Crashlytics/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Pods/FirebaseCrashlytics/
149154
([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Crashlytics)
150155
- name: Test swift quickstart
156+
env:
157+
LEGACY: true
151158
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Crashlytics swift)
152159
- name: Remove data before upload
160+
env:
161+
LEGACY: true
153162
run: scripts/remove_data.sh crashlytics release_testing
154163
- uses: actions/upload-artifact@v2
155164
if: ${{ failure() }}

‎.github/workflows/zip.yml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -231,14 +231,16 @@ jobs:
231231
mkdir -p "${HOME}"/ios_frameworks/
232232
find "${GITHUB_WORKSPACE}/${FRAMEWORK_DIR}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
233233
- name: Setup quickstart
234+
env:
235+
LEGACY: true
234236
run: |
235237
SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
236238
"${HOME}"/ios_frameworks/Firebase/FirebaseCrashlytics/* \
237239
"${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
238-
cp quickstart-ios/crashlytics/Firebase/run quickstart-ios/crashlytics
239-
cp quickstart-ios/crashlytics/Firebase/upload-symbols quickstart-ios/crashlytics
240-
chmod +x quickstart-ios/crashlytics/run
241-
chmod +x quickstart-ios/crashlytics/upload-symbols
240+
cp quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Firebase/run quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart
241+
cp quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/Firebase/upload-symbols quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart
242+
chmod +x quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/run
243+
chmod +x quickstart-ios/crashlytics/LegacyCrashlyticsQuickstart/upload-symbols
242244
# TODO(#8057): Restore Swift Quickstart
243245
# - name: Setup swift quickstart
244246
# run: |
@@ -251,10 +253,14 @@ jobs:
251253
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/FIREGSignInInfo.h.gpg \
252254
quickstart-ios/TestUtils/FIREGSignInInfo.h "$signin_secret"
253255
- name: Test Quickstart
256+
env:
257+
LEGACY: true
254258
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}")
255259
# - name: Test Swift Quickstart
256260
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_framework.sh "${SDK}" swift)
257261
- name: Remove data before upload
262+
env:
263+
LEGACY: true
258264
if: ${{ failure() }}
259265
run: scripts/remove_data.sh crashlytics
260266
- uses: actions/upload-artifact@v2

‎scripts/remove_data.sh‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,17 @@ set -xe
1616

1717
SDK="$1"
1818
MODE=${2-}
19+
20+
DIR="${SDK}"
21+
22+
if [[ ! -z "$LEGACY" ]]; then
23+
DIR="${SDK}/Legacy${SDK}Quickstart"
24+
fi
25+
26+
1927
if [ "$MODE" == "release_testing" ]; then
2028
echo "Update podfiles release_testing."
21-
sed -i "" "s/https:\/\/.*@github.com\/FirebasePrivate\/SpecsTesting.git/https:\/\/github.com\/FirebasePrivate\/SpecsTesting.git/g" quickstart-ios/"${SDK}"/Podfile quickstart-ios/"${SDK}"/Podfile.lock
29+
sed -i "" "s/https:\/\/.*@github.com\/FirebasePrivate\/SpecsTesting.git/https:\/\/github.com\/FirebasePrivate\/SpecsTesting.git/g" quickstart-ios/"${DIR}"/Podfile quickstart-ios/"${DIR}"/Podfile.lock
2230
fi
23-
rm -f quickstart-ios/"${SDK}"/GoogleService-Info.plist
31+
rm -f quickstart-ios/"${DIR}"/GoogleService-Info.plist
2432
rm -f quickstart-ios/TestUtils/FIREGSignInInfo.h

‎scripts/setup_quickstart.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,14 @@ SAMPLE=$1
3131
RELEASE_TESTING=${2-}
3232

3333
WORKSPACE_DIR="quickstart-ios/${SAMPLE}"
34+
PODFILE="quickstart-ios/"$SAMPLE"/Podfile"
3435

3536
if [[ ! -z "${LEGACY:-}" ]]; then
3637
WORKSPACE_DIR="quickstart-ios/${SAMPLE}/Legacy${SAMPLE}Quickstart"
38+
PODFILE="quickstart-ios/"$SAMPLE"/Legacy${SAMPLE}Quickstart/Podfile"
3739
fi
3840

41+
3942
# Installations is the only quickstart that doesn't need a real
4043
# GoogleService-Info.plist for its tests.
4144
if check_secrets || [[ ${SAMPLE} == "installations" ]]; then
@@ -48,13 +51,13 @@ if check_secrets || [[ ${SAMPLE} == "installations" ]]; then
4851
$scripts_dir/localize_podfile.swift "$WORKSPACE_DIR"/Podfile "$RELEASE_TESTING"
4952
if [ "$RELEASE_TESTING" == "nightly_release_testing" ]; then
5053
set +x
51-
sed -i "" '1i\'$'\n'"source 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsTesting.git'"$'\n' quickstart-ios/"$SAMPLE"/Podfile
54+
sed -i "" '1i\'$'\n'"source 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsTesting.git'"$'\n' "$PODFILE"
5255
set -x
5356
echo "Source of Podfile for nightly release testing is updated."
5457
fi
5558
if [ "$RELEASE_TESTING" == "prerelease_testing" ]; then
5659
set +x
57-
sed -i "" '1i\'$'\n'"source 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsReleasing.git'"$'\n' quickstart-ios/"$SAMPLE"/Podfile
60+
sed -i "" '1i\'$'\n'"source 'https://${BOT_TOKEN}@github.com/FirebasePrivate/SpecsReleasing.git'"$'\n' "$PODFILE"
5861
set -x
5962
echo "Source of Podfile for prerelease testing is updated."
6063
fi

‎scripts/setup_quickstart_framework.sh‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,15 @@ REPO=`pwd`
1818
if [ ! -d "quickstart-ios" ]; then
1919
git clone https://github.com/firebase/quickstart-ios.git
2020
fi
21+
QS_SCRIPTS="${REPO}"/quickstart-ios/scripts
2122
cd quickstart-ios/"${SAMPLE}"
22-
chmod +x ../scripts/info_script.rb
23-
ruby ../scripts/info_script.rb "${SAMPLE}"
23+
24+
chmod +x "${QS_SCRIPTS}"/info_script.rb
25+
ruby "${QS_SCRIPTS}"/info_script.rb "${SAMPLE}" "${LEGACY:-}"
26+
27+
if [[ ! -z "$LEGACY" ]]; then
28+
cd "Legacy${SAMPLE}Quickstart"
29+
fi
2430

2531
mkdir -p Firebase/
2632
# Create non Firebase Frameworks and move to Firebase/ dir.
@@ -41,13 +47,13 @@ do
4147
done
4248

4349
if [[ "${SAMPLE}" == "Authentication" ]]; then
44-
../scripts/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path usr/lib/libc++.dylib
45-
../scripts/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path accelerate.framework --source_tree DEVELOPER_FRAMEWORKS_DIR
50+
"${QS_SCRIPTS}"/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path usr/lib/libc++.dylib
51+
"${QS_SCRIPTS}"/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path accelerate.framework --source_tree DEVELOPER_FRAMEWORKS_DIR
4652
fi
4753

4854
if [[ "${SAMPLE}" == "Firestore" ]]; then
49-
../scripts/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path Firebase/FirebaseUI.xcframework/Resources/FirebaseAuthUI.bundle
50-
../scripts/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path Firebase/FirebaseUI.xcframework/Resources/FirebaseEmailAuthUI.bundle
55+
"${QS_SCRIPTS}"/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path Firebase/FirebaseAuthUI.xcframework/Resources/FirebaseAuthUI.bundle
56+
"${QS_SCRIPTS}"/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path Firebase/FirebaseEmailAuthUI.xcframework/Resources/FirebaseEmailAuthUI.bundle
5157
fi
5258

53-
../scripts/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path Firebase/
59+
"${QS_SCRIPTS}"/add_framework_script.rb --sdk "${SAMPLE}" --target "${TARGET}" --framework_path Firebase/

‎scripts/test_quickstart_framework.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,4 @@ if check_secrets; then
3333
else
3434
have_secrets=true SAMPLE="$sample" scripts/framework_test.sh
3535
fi
36-
3736
fi

0 commit comments

Comments
 (0)