From a4adcf9b4462d02966b3fd2feaea53af1671557c Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Wed, 26 Nov 2025 12:15:37 -0500 Subject: [PATCH 1/2] fix: crashlytics cron --- .github/workflows/crashlytics.yml | 77 ++++++++++++++++--------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index 8e074482d08..165376fbfbe 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -25,37 +25,38 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} cancel-in-progress: true -jobs: - spm: - uses: ./.github/workflows/common.yml - with: - target: FirebaseCrashlyticsUnit - - catalyst: - uses: ./.github/workflows/common_catalyst.yml - with: - product: FirebaseCrashlytics - target: FirebaseCrashlytics-Unit-unit - - pod_lib_lint: - uses: ./.github/workflows/common_cocoapods.yml - with: - product: FirebaseCrashlytics - buildonly_platforms: tvOS, macOS, watchOS - - quickstart: - uses: ./.github/workflows/common_quickstart.yml - with: - product: Crashlytics - setup_command: scripts/setup_quickstart_spm.sh crashlytics - plist_src_path: scripts/gha-encrypted/qs-crashlytics.plist.gpg - plist_dst_path: quickstart-ios/crashlytics/GoogleService-Info.plist - secrets: - plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} +#jobs: +# spm: +# uses: ./.github/workflows/common.yml +# with: +# target: FirebaseCrashlyticsUnit +# +# catalyst: +# uses: ./.github/workflows/common_catalyst.yml +# with: +# product: FirebaseCrashlytics +# target: FirebaseCrashlytics-Unit-unit +# +# pod_lib_lint: +# uses: ./.github/workflows/common_cocoapods.yml +# with: +# product: FirebaseCrashlytics +# buildonly_platforms: tvOS, macOS, watchOS +# +# quickstart: +# uses: ./.github/workflows/common_quickstart.yml +# with: +# product: Crashlytics +# setup_command: scripts/setup_quickstart_spm.sh crashlytics +# plist_src_path: scripts/gha-encrypted/qs-crashlytics.plist.gpg +# plist_dst_path: quickstart-ios/crashlytics/GoogleService-Info.plist +# secrets: +# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} +jobs: quickstart-ftl-cron-only: # Don't run on private repo. - if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule' + if: github.repository == 'Firebase/firebase-ios-sdk' env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} @@ -63,13 +64,17 @@ jobs: steps: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1 + - name: Setup Bundler + run: scripts/setup_bundler.sh + - name: Install xcpretty + run: gem install xcpretty - uses: actions/setup-python@v5 with: python-version: '3.11' - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup quickstart - run: scripts/setup_quickstart.sh crashlytics + run: QUICKSTART_BRANCH=nc/strg-tests scripts/setup_quickstart_spm.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" @@ -83,10 +88,10 @@ jobs: testapp_dir: quickstart-ios/build-for-testing test_type: "xctest" - crashlytics-cron-only: - needs: pod_lib_lint - uses: ./.github/workflows/common_cocoapods_cron.yml - with: - product: FirebaseCrashlytics - platforms: '[ "ios", "tvos", "macos", "watchos --skip-tests" ]' - flags: '[ "--use-static-frameworks", "--use-modular-headers --skip-tests" ]' + # crashlytics-cron-only: + # needs: pod_lib_lint + # uses: ./.github/workflows/common_cocoapods_cron.yml + # with: + # product: FirebaseCrashlytics + # platforms: '[ "ios", "tvos", "macos", "watchos --skip-tests" ]' + # flags: '[ "--use-static-frameworks", "--use-modular-headers --skip-tests" ]' From a0bc39140d4c5e2ec2bd344ee0618217dbeb249e Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Wed, 26 Nov 2025 12:35:05 -0500 Subject: [PATCH 2/2] fix: crashlytics cron --- .github/workflows/crashlytics.yml | 73 +++++++++++++++---------------- 1 file changed, 36 insertions(+), 37 deletions(-) diff --git a/.github/workflows/crashlytics.yml b/.github/workflows/crashlytics.yml index 165376fbfbe..3969c1eb223 100644 --- a/.github/workflows/crashlytics.yml +++ b/.github/workflows/crashlytics.yml @@ -25,38 +25,37 @@ concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.ref }} cancel-in-progress: true -#jobs: -# spm: -# uses: ./.github/workflows/common.yml -# with: -# target: FirebaseCrashlyticsUnit -# -# catalyst: -# uses: ./.github/workflows/common_catalyst.yml -# with: -# product: FirebaseCrashlytics -# target: FirebaseCrashlytics-Unit-unit -# -# pod_lib_lint: -# uses: ./.github/workflows/common_cocoapods.yml -# with: -# product: FirebaseCrashlytics -# buildonly_platforms: tvOS, macOS, watchOS -# -# quickstart: -# uses: ./.github/workflows/common_quickstart.yml -# with: -# product: Crashlytics -# setup_command: scripts/setup_quickstart_spm.sh crashlytics -# plist_src_path: scripts/gha-encrypted/qs-crashlytics.plist.gpg -# plist_dst_path: quickstart-ios/crashlytics/GoogleService-Info.plist -# secrets: -# plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} - jobs: + spm: + uses: ./.github/workflows/common.yml + with: + target: FirebaseCrashlyticsUnit + + catalyst: + uses: ./.github/workflows/common_catalyst.yml + with: + product: FirebaseCrashlytics + target: FirebaseCrashlytics-Unit-unit + + pod_lib_lint: + uses: ./.github/workflows/common_cocoapods.yml + with: + product: FirebaseCrashlytics + buildonly_platforms: tvOS, macOS, watchOS + + quickstart: + uses: ./.github/workflows/common_quickstart.yml + with: + product: Crashlytics + setup_command: scripts/setup_quickstart_spm.sh crashlytics + plist_src_path: scripts/gha-encrypted/qs-crashlytics.plist.gpg + plist_dst_path: quickstart-ios/crashlytics/GoogleService-Info.plist + secrets: + plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} + quickstart-ftl-cron-only: # Don't run on private repo. - if: github.repository == 'Firebase/firebase-ios-sdk' + if: github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule' env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} @@ -74,7 +73,7 @@ jobs: - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup quickstart - run: QUICKSTART_BRANCH=nc/strg-tests scripts/setup_quickstart_spm.sh crashlytics + run: scripts/setup_quickstart_spm.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" @@ -88,10 +87,10 @@ jobs: testapp_dir: quickstart-ios/build-for-testing test_type: "xctest" - # crashlytics-cron-only: - # needs: pod_lib_lint - # uses: ./.github/workflows/common_cocoapods_cron.yml - # with: - # product: FirebaseCrashlytics - # platforms: '[ "ios", "tvos", "macos", "watchos --skip-tests" ]' - # flags: '[ "--use-static-frameworks", "--use-modular-headers --skip-tests" ]' + crashlytics-cron-only: + needs: pod_lib_lint + uses: ./.github/workflows/common_cocoapods_cron.yml + with: + product: FirebaseCrashlytics + platforms: '[ "ios", "tvos", "macos", "watchos --skip-tests" ]' + flags: '[ "--use-static-frameworks", "--use-modular-headers --skip-tests" ]'