From 0c616a96e89ab98c21be23aeebe9a1fc23311798 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 16 Dec 2025 13:51:51 -0500 Subject: [PATCH 1/5] fix: storage.yml FTL cron --- .github/workflows/storage.yml | 142 +++++++++++++++++----------------- 1 file changed, 70 insertions(+), 72 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index ba71a3c1082..b5f9b6c356b 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -26,66 +26,66 @@ concurrency: cancel-in-progress: true jobs: - spm: - uses: ./.github/workflows/common.yml - with: - target: FirebaseStorageUnit + # spm: + # uses: ./.github/workflows/common.yml + # with: + # target: FirebaseStorageUnit - catalyst: - uses: ./.github/workflows/common_catalyst.yml - with: - product: FirebaseStorage - target: FirebaseStorage-Unit-unit + # catalyst: + # uses: ./.github/workflows/common_catalyst.yml + # with: + # product: FirebaseStorage + # target: FirebaseStorage-Unit-unit - storage-integration-tests: - # Don't run on private repo unless it is a PR. - if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' - strategy: - matrix: - language: [Swift, ObjC] - include: - - os: macos-15 - xcode: Xcode_16.4 - env: - plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} - runs-on: ${{ matrix.os }} - 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 - - name: Install Secret GoogleService-Info.plist - run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \ - FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret" - - name: Install Credentials.h - run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \ - FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret" - - name: Install Credentials.swift - run: | - scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \ - FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret" - - name: Xcode - run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3 - with: - timeout_minutes: 15 - max_attempts: 3 - retry_wait_seconds: 120 - command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all) + # storage-integration-tests: + # # Don't run on private repo unless it is a PR. + # if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + # strategy: + # matrix: + # language: [Swift, ObjC] + # include: + # - os: macos-15 + # xcode: Xcode_16.4 + # env: + # plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} + # runs-on: ${{ matrix.os }} + # 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 + # - name: Install Secret GoogleService-Info.plist + # run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \ + # FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret" + # - name: Install Credentials.h + # run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \ + # FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret" + # - name: Install Credentials.swift + # run: | + # scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \ + # FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret" + # - name: Xcode + # run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer + # - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3 + # with: + # timeout_minutes: 15 + # max_attempts: 3 + # retry_wait_seconds: 120 + # command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all) - quickstart: - # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed. - uses: ./.github/workflows/common_quickstart.yml - with: - product: Storage - setup_command: scripts/setup_quickstart_spm.sh storage - plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg - plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist - run_tests: false - secrets: - plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} + # quickstart: + # # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed. + # uses: ./.github/workflows/common_quickstart.yml + # with: + # product: Storage + # setup_command: scripts/setup_quickstart_spm.sh storage + # plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg + # plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist + # run_tests: false + # secrets: + # plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} quickstart-ftl-cron-only: # Don't run on private repo. @@ -100,12 +100,10 @@ jobs: with: python-version: '3.11' - name: Setup quickstart - run: scripts/setup_quickstart.sh storage + run: QUICKSTART_BRANCH=nc/strg-tests scripts/setup_quickstart_spm.sh storage - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \ quickstart-ios/storage/GoogleService-Info.plist "$plist_secret" - # - name: Build objc quickstart - # run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Storage) - name: Build swift quickstart run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart_ftl.sh Storage swift) - id: ftl_test @@ -115,16 +113,16 @@ jobs: testapp_dir: quickstart-ios/build-for-testing test_type: "xctest" - pod_lib_lint: - uses: ./.github/workflows/common_cocoapods.yml - with: - product: FirebaseStorage - test_specs: unit + # pod_lib_lint: + # uses: ./.github/workflows/common_cocoapods.yml + # with: + # product: FirebaseStorage + # test_specs: unit - storage-cron-only: - needs: pod_lib_lint - uses: ./.github/workflows/common_cocoapods_cron.yml - with: - product: FirebaseStorage - platforms: '[ "ios", "tvos", "macos", "watchos" ]' - flags: '[ "--use-static-frameworks --skip-tests" ]' + # storage-cron-only: + # needs: pod_lib_lint + # uses: ./.github/workflows/common_cocoapods_cron.yml + # with: + # product: FirebaseStorage + # platforms: '[ "ios", "tvos", "macos", "watchos" ]' + # flags: '[ "--use-static-frameworks --skip-tests" ]' From 6d1f53c3b95893df99aabd301cd0d16df98398bd Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 16 Dec 2025 14:02:39 -0500 Subject: [PATCH 2/5] Update storage.yml --- .github/workflows/storage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index b5f9b6c356b..3de90c98b95 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -89,7 +89,7 @@ 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' # && github.event_name == 'schedule' env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} runs-on: macos-15 From c4f9d2fcde4be182e76be8737331d5f802d72eca Mon Sep 17 00:00:00 2001 From: Nick Cooke Date: Tue, 16 Dec 2025 15:00:38 -0500 Subject: [PATCH 3/5] fixes --- .github/workflows/storage.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 3de90c98b95..80c86b3c267 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -99,6 +99,12 @@ jobs: - uses: actions/setup-python@v5 with: python-version: '3.11' + - name: Setup Bundler + run: scripts/setup_bundler.sh + - name: Install xcpretty + run: gem install xcpretty + - 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 storage - name: Install Secret GoogleService-Info.plist From fcd754ad1242410928b59fd17266ba303947b821 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 16 Dec 2025 16:26:51 -0500 Subject: [PATCH 4/5] Update .github/workflows/storage.yml --- .github/workflows/storage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 80c86b3c267..4610a889cde 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -106,7 +106,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 storage + run: QUICKSTART_BRANCH=nc/stg-fix scripts/setup_quickstart_spm.sh storage - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \ quickstart-ios/storage/GoogleService-Info.plist "$plist_secret" From d6c0c4c128fd5dcc431cde2c45910883e70bbc5f Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Tue, 16 Dec 2025 16:44:29 -0500 Subject: [PATCH 5/5] update --- .github/workflows/storage.yml | 142 +++++++++++++++++----------------- 1 file changed, 71 insertions(+), 71 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 4610a889cde..44e3baccaa1 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -26,70 +26,70 @@ concurrency: cancel-in-progress: true jobs: - # spm: - # uses: ./.github/workflows/common.yml - # with: - # target: FirebaseStorageUnit + spm: + uses: ./.github/workflows/common.yml + with: + target: FirebaseStorageUnit - # catalyst: - # uses: ./.github/workflows/common_catalyst.yml - # with: - # product: FirebaseStorage - # target: FirebaseStorage-Unit-unit + catalyst: + uses: ./.github/workflows/common_catalyst.yml + with: + product: FirebaseStorage + target: FirebaseStorage-Unit-unit - # storage-integration-tests: - # # Don't run on private repo unless it is a PR. - # if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' - # strategy: - # matrix: - # language: [Swift, ObjC] - # include: - # - os: macos-15 - # xcode: Xcode_16.4 - # env: - # plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} - # runs-on: ${{ matrix.os }} - # 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 - # - name: Install Secret GoogleService-Info.plist - # run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \ - # FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret" - # - name: Install Credentials.h - # run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \ - # FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret" - # - name: Install Credentials.swift - # run: | - # scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \ - # FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret" - # - name: Xcode - # run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - # - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3 - # with: - # timeout_minutes: 15 - # max_attempts: 3 - # retry_wait_seconds: 120 - # command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all) + storage-integration-tests: + # Don't run on private repo unless it is a PR. + if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' + strategy: + matrix: + language: [Swift, ObjC] + include: + - os: macos-15 + xcode: Xcode_16.4 + env: + plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} + runs-on: ${{ matrix.os }} + 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 + - name: Install Secret GoogleService-Info.plist + run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/storage-db-plist.gpg \ + FirebaseStorage/Tests/Integration/Resources/GoogleService-Info.plist "$plist_secret" + - name: Install Credentials.h + run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.h.gpg \ + FirebaseStorage/Tests/ObjCIntegration/Credentials.h "$plist_secret" + - name: Install Credentials.swift + run: | + scripts/decrypt_gha_secret.sh scripts/gha-encrypted/Storage/Credentials.swift.gpg \ + FirebaseStorage/Tests/Integration/Credentials.swift "$plist_secret" + - name: Xcode + run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer + - uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3 + with: + timeout_minutes: 15 + max_attempts: 3 + retry_wait_seconds: 120 + command: ([ -z $plist_secret ] || scripts/build.sh Storage${{ matrix.language }} all) - # quickstart: - # # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed. - # uses: ./.github/workflows/common_quickstart.yml - # with: - # product: Storage - # setup_command: scripts/setup_quickstart_spm.sh storage - # plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg - # plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist - # run_tests: false - # secrets: - # plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} + quickstart: + # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed. + uses: ./.github/workflows/common_quickstart.yml + with: + product: Storage + setup_command: scripts/setup_quickstart_spm.sh storage + plist_src_path: scripts/gha-encrypted/qs-storage.plist.gpg + plist_dst_path: quickstart-ios/storage/GoogleService-Info.plist + run_tests: false + secrets: + plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} 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' && github.event_name == 'schedule' env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} runs-on: macos-15 @@ -106,7 +106,7 @@ jobs: - name: Xcode run: sudo xcode-select -s /Applications/Xcode_16.4.app/Contents/Developer - name: Setup quickstart - run: QUICKSTART_BRANCH=nc/stg-fix scripts/setup_quickstart_spm.sh storage + run: scripts/setup_quickstart_spm.sh storage - name: Install Secret GoogleService-Info.plist run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-storage.plist.gpg \ quickstart-ios/storage/GoogleService-Info.plist "$plist_secret" @@ -119,16 +119,16 @@ jobs: testapp_dir: quickstart-ios/build-for-testing test_type: "xctest" - # pod_lib_lint: - # uses: ./.github/workflows/common_cocoapods.yml - # with: - # product: FirebaseStorage - # test_specs: unit + pod_lib_lint: + uses: ./.github/workflows/common_cocoapods.yml + with: + product: FirebaseStorage + test_specs: unit - # storage-cron-only: - # needs: pod_lib_lint - # uses: ./.github/workflows/common_cocoapods_cron.yml - # with: - # product: FirebaseStorage - # platforms: '[ "ios", "tvos", "macos", "watchos" ]' - # flags: '[ "--use-static-frameworks --skip-tests" ]' + storage-cron-only: + needs: pod_lib_lint + uses: ./.github/workflows/common_cocoapods_cron.yml + with: + product: FirebaseStorage + platforms: '[ "ios", "tvos", "macos", "watchos" ]' + flags: '[ "--use-static-frameworks --skip-tests" ]'