Skip to content

Commit 26536b9

Browse files
ncooke3ncooke3
authored
chore: Revert debugging code in nc/quickstarts branch (#15479)
1 parent 883da48 commit 26536b9

File tree

10 files changed

+713
-717
lines changed

10 files changed

+713
-717
lines changed

‎.github/workflows/abtesting.yml‎

Lines changed: 47 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,21 @@ concurrency:
2525
cancel-in-progress: true
2626

2727
jobs:
28-
# spm:
29-
# uses: ./.github/workflows/common.yml
30-
# with:
31-
# target: ABTestingUnit
28+
spm:
29+
uses: ./.github/workflows/common.yml
30+
with:
31+
target: ABTestingUnit
3232

33-
# catalyst:
34-
# uses: ./.github/workflows/common_catalyst.yml
35-
# with:
36-
# product: FirebaseABTesting
37-
# target: FirebaseABTesting-Unit-unit
33+
catalyst:
34+
uses: ./.github/workflows/common_catalyst.yml
35+
with:
36+
product: FirebaseABTesting
37+
target: FirebaseABTesting-Unit-unit
3838

39-
# pod_lib_lint:
40-
# uses: ./.github/workflows/common_cocoapods.yml
41-
# with:
42-
# product: FirebaseABTesting
39+
pod_lib_lint:
40+
uses: ./.github/workflows/common_cocoapods.yml
41+
with:
42+
product: FirebaseABTesting
4343

4444
quickstart:
4545
uses: ./.github/workflows/common_quickstart.yml
@@ -51,41 +51,39 @@ jobs:
5151
secrets:
5252
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
5353

54-
# quickstart-ftl-cron-only:
55-
# # Don't run on private repo.
56-
# if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
54+
quickstart-ftl-cron-only:
55+
# Don't run on private repo.
56+
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
5757

58-
# env:
59-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
60-
# runs-on: macos-15
61-
# steps:
62-
# - uses: actions/checkout@v4
63-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
64-
# - uses: actions/setup-python@v5
65-
# with:
66-
# python-version: '3.11'
67-
# - name: Setup quickstart
68-
# env:
69-
# run: scripts/setup_quickstart.sh abtesting
70-
# - name: Install Secret GoogleService-Info.plist
71-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
72-
# quickstart-ios/abtesting/GoogleService-Info.plist "$plist_secret"
73-
# - name: Xcode
74-
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
75-
# - name: Build swift quickstart
76-
# env:
77-
# run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh ABTesting)
78-
# - id: ftl_test
79-
# uses: FirebaseExtended/github-actions/[email protected]
80-
# with:
81-
# credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
82-
# testapp_dir: quickstart-ios/build-for-testing
83-
# test_type: "xctest"
58+
env:
59+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
60+
runs-on: macos-15
61+
steps:
62+
- uses: actions/checkout@v4
63+
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
64+
- uses: actions/setup-python@v5
65+
with:
66+
python-version: '3.11'
67+
- name: Setup quickstart
68+
run: scripts/setup_quickstart.sh abtesting
69+
- name: Install Secret GoogleService-Info.plist
70+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-abtesting.plist.gpg \
71+
quickstart-ios/abtesting/GoogleService-Info.plist "$plist_secret"
72+
- name: Xcode
73+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
74+
- name: Build swift quickstart
75+
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh ABTesting)
76+
- id: ftl_test
77+
uses: FirebaseExtended/github-actions/[email protected]
78+
with:
79+
credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
80+
testapp_dir: quickstart-ios/build-for-testing
81+
test_type: "xctest"
8482

85-
# abtesting-cron-only:
86-
# needs: pod_lib_lint
87-
# uses: ./.github/workflows/common_cocoapods_cron.yml
88-
# with:
89-
# product: FirebaseABTesting
90-
# platforms: '[ "ios", "tvos", "macos" ]'
91-
# flags: '[ "--use-static-frameworks" ]'
83+
abtesting-cron-only:
84+
needs: pod_lib_lint
85+
uses: ./.github/workflows/common_cocoapods_cron.yml
86+
with:
87+
product: FirebaseABTesting
88+
platforms: '[ "ios", "tvos", "macos" ]'
89+
flags: '[ "--use-static-frameworks" ]'

‎.github/workflows/auth.yml‎

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -29,69 +29,69 @@ concurrency:
2929
cancel-in-progress: true
3030

3131
jobs:
32-
# spm:
33-
# uses: ./.github/workflows/common.yml
34-
# with:
35-
# target: AuthUnit
36-
# buildonly_platforms: macOS
32+
spm:
33+
uses: ./.github/workflows/common.yml
34+
with:
35+
target: AuthUnit
36+
buildonly_platforms: macOS
3737

38-
# catalyst:
39-
# uses: ./.github/workflows/common_catalyst.yml
40-
# with:
41-
# product: FirebaseAuth
42-
# target: FirebaseAuth-Unit-unit
43-
# buildonly: true
38+
catalyst:
39+
uses: ./.github/workflows/common_catalyst.yml
40+
with:
41+
product: FirebaseAuth
42+
target: FirebaseAuth-Unit-unit
43+
buildonly: true
4444

45-
# pod_lib_lint:
46-
# strategy:
47-
# matrix:
48-
# product: [FirebaseAuthInterop, FirebaseAuth]
49-
# uses: ./.github/workflows/common_cocoapods.yml
50-
# with:
51-
# product: ${{ matrix.product }}
52-
# buildonly_platforms: macOS
45+
pod_lib_lint:
46+
strategy:
47+
matrix:
48+
product: [FirebaseAuthInterop, FirebaseAuth]
49+
uses: ./.github/workflows/common_cocoapods.yml
50+
with:
51+
product: ${{ matrix.product }}
52+
buildonly_platforms: macOS
5353

54-
# integration-tests:
55-
# # Don't run on private repo unless it is a PR.
56-
# if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
57-
# needs: spm
58-
# strategy:
59-
# matrix:
60-
# scheme: [ObjCApiTests, SwiftApiTests, AuthenticationExampleUITests]
61-
# env:
62-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
63-
# FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
64-
# runs-on: macos-15
65-
# steps:
66-
# - uses: actions/checkout@v4
67-
# - uses: actions/cache/restore@v4
68-
# with:
69-
# path: .build
70-
# key: ${{ needs.spm.outputs.cache_key }}
71-
# - name: Install Secrets
72-
# run: |
73-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthCredentials.h.gpg \
74-
# FirebaseAuth/Tests/SampleSwift/ObjCApiTests/AuthCredentials.h "$plist_secret"
75-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg \
76-
# FirebaseAuth/Tests/SampleSwift/AuthenticationExample/SwiftApplication.plist "$plist_secret"
77-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/AuthCredentials.h.gpg \
78-
# FirebaseAuth/Tests/SampleSwift/AuthCredentials.h "$plist_secret"
79-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info.plist.gpg \
80-
# FirebaseAuth/Tests/SampleSwift/GoogleService-Info.plist "$plist_secret"
81-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info_multi.plist.gpg \
82-
# FirebaseAuth/Tests/SampleSwift/GoogleService-Info_multi.plist "$plist_secret"
83-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Sample.entitlements.gpg \
84-
# FirebaseAuth/Tests/SampleSwift/Sample.entitlements "$plist_secret"
85-
# scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
86-
# FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
87-
# - name: Xcode
88-
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
89-
# - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
90-
# with:
91-
# timeout_minutes: 15
92-
# max_attempts: 3
93-
# retry_wait_seconds: 120
94-
# command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
54+
integration-tests:
55+
# Don't run on private repo unless it is a PR.
56+
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
57+
needs: spm
58+
strategy:
59+
matrix:
60+
scheme: [ObjCApiTests, SwiftApiTests, AuthenticationExampleUITests]
61+
env:
62+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
63+
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
64+
runs-on: macos-15
65+
steps:
66+
- uses: actions/checkout@v4
67+
- uses: actions/cache/restore@v4
68+
with:
69+
path: .build
70+
key: ${{ needs.spm.outputs.cache_key }}
71+
- name: Install Secrets
72+
run: |
73+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthCredentials.h.gpg \
74+
FirebaseAuth/Tests/SampleSwift/ObjCApiTests/AuthCredentials.h "$plist_secret"
75+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/SwiftApplication.plist.gpg \
76+
FirebaseAuth/Tests/SampleSwift/AuthenticationExample/SwiftApplication.plist "$plist_secret"
77+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/AuthCredentials.h.gpg \
78+
FirebaseAuth/Tests/SampleSwift/AuthCredentials.h "$plist_secret"
79+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info.plist.gpg \
80+
FirebaseAuth/Tests/SampleSwift/GoogleService-Info.plist "$plist_secret"
81+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/GoogleService-Info_multi.plist.gpg \
82+
FirebaseAuth/Tests/SampleSwift/GoogleService-Info_multi.plist "$plist_secret"
83+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Sample.entitlements.gpg \
84+
FirebaseAuth/Tests/SampleSwift/Sample.entitlements "$plist_secret"
85+
scripts/decrypt_gha_secret.sh scripts/gha-encrypted/AuthSample/Credentials.swift.gpg \
86+
FirebaseAuth/Tests/SampleSwift/SwiftApiTests/Credentials.swift "$plist_secret"
87+
- name: Xcode
88+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
89+
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
90+
with:
91+
timeout_minutes: 15
92+
max_attempts: 3
93+
retry_wait_seconds: 120
94+
command: ([ -z $plist_secret ] || scripts/build.sh Auth iOS ${{ matrix.scheme }})
9595

9696
quickstart:
9797
uses: ./.github/workflows/common_quickstart.yml
@@ -140,6 +140,5 @@ jobs:
140140
platforms: '[ "ios", "tvos --skip-tests", "macos --skip-tests", "watchos --skip-tests" ]'
141141
flags: '[ "--use-static-frameworks" ]'
142142
setup_command: scripts/configure_test_keychain.sh
143-
ignore_deprecation_warnings: true
144143
secrets:
145144
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

‎.github/workflows/crashlytics.yml‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,22 @@ concurrency:
2626
cancel-in-progress: true
2727

2828
jobs:
29-
# spm:
30-
# uses: ./.github/workflows/common.yml
31-
# with:
32-
# target: FirebaseCrashlyticsUnit
29+
spm:
30+
uses: ./.github/workflows/common.yml
31+
with:
32+
target: FirebaseCrashlyticsUnit
3333

34-
# catalyst:
35-
# uses: ./.github/workflows/common_catalyst.yml
36-
# with:
37-
# product: FirebaseCrashlytics
38-
# target: FirebaseCrashlytics-Unit-unit
34+
catalyst:
35+
uses: ./.github/workflows/common_catalyst.yml
36+
with:
37+
product: FirebaseCrashlytics
38+
target: FirebaseCrashlytics-Unit-unit
3939

40-
# pod_lib_lint:
41-
# uses: ./.github/workflows/common_cocoapods.yml
42-
# with:
43-
# product: FirebaseCrashlytics
44-
# buildonly_platforms: tvOS, macOS, watchOS
40+
pod_lib_lint:
41+
uses: ./.github/workflows/common_cocoapods.yml
42+
with:
43+
product: FirebaseCrashlytics
44+
buildonly_platforms: tvOS, macOS, watchOS
4545

4646
quickstart:
4747
uses: ./.github/workflows/common_quickstart.yml
@@ -53,40 +53,40 @@ jobs:
5353
secrets:
5454
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
5555

56-
# quickstart-ftl-cron-only:
57-
# # Don't run on private repo.
58-
# if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
56+
quickstart-ftl-cron-only:
57+
# Don't run on private repo.
58+
if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule'
5959

60-
# env:
61-
# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
62-
# runs-on: macos-15
63-
# steps:
64-
# - uses: actions/checkout@v4
65-
# - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
66-
# - uses: actions/setup-python@v5
67-
# with:
68-
# python-version: '3.11'
69-
# - name: Xcode
70-
# run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
71-
# - name: Setup quickstart
72-
# run: scripts/setup_quickstart.sh crashlytics
73-
# - name: Install Secret GoogleService-Info.plist
74-
# run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \
75-
# quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret"
76-
# - name: Build swift quickstart
77-
# run: |
78-
# ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Crashlytics swift)
79-
# - id: ftl_test
80-
# uses: FirebaseExtended/github-actions/[email protected]
81-
# with:
82-
# credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
83-
# testapp_dir: quickstart-ios/build-for-testing
84-
# test_type: "xctest"
60+
env:
61+
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
62+
runs-on: macos-15
63+
steps:
64+
- uses: actions/checkout@v4
65+
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
66+
- uses: actions/setup-python@v5
67+
with:
68+
python-version: '3.11'
69+
- name: Xcode
70+
run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer
71+
- name: Setup quickstart
72+
run: scripts/setup_quickstart.sh crashlytics
73+
- name: Install Secret GoogleService-Info.plist
74+
run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-crashlytics.plist.gpg \
75+
quickstart-ios/crashlytics/GoogleService-Info.plist "$plist_secret"
76+
- name: Build swift quickstart
77+
run: |
78+
([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Crashlytics swift)
79+
- id: ftl_test
80+
uses: FirebaseExtended/github-actions/[email protected]
81+
with:
82+
credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_CREDENTIALS }}
83+
testapp_dir: quickstart-ios/build-for-testing
84+
test_type: "xctest"
8585

86-
# crashlytics-cron-only:
87-
# needs: pod_lib_lint
88-
# uses: ./.github/workflows/common_cocoapods_cron.yml
89-
# with:
90-
# product: FirebaseCrashlytics
91-
# platforms: '[ "ios", "tvos", "macos", "watchos --skip-tests" ]'
92-
# flags: '[ "--use-static-frameworks", "--use-modular-headers --skip-tests" ]'
86+
crashlytics-cron-only:
87+
needs: pod_lib_lint
88+
uses: ./.github/workflows/common_cocoapods_cron.yml
89+
with:
90+
product: FirebaseCrashlytics
91+
platforms: '[ "ios", "tvos", "macos", "watchos --skip-tests" ]'
92+
flags: '[ "--use-static-frameworks", "--use-modular-headers --skip-tests" ]'

0 commit comments

Comments
 (0)