From 10f0b02da6684f086c3adb00fc153408a9391de7 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 16 Feb 2024 08:23:03 -0800 Subject: [PATCH 1/3] Disable flaky Storage qs --- .github/workflows/storage.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index 4585647f1283..ead39f23f72a 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -114,6 +114,7 @@ jobs: if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request' strategy: matrix: + swift: [swift, ""] include: - os: macos-12 xcode: Xcode_14.2 @@ -134,10 +135,8 @@ jobs: quickstart-ios/storage/GoogleService-Info.plist "$plist_secret" - name: Xcode run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - - name: Test objc quickstart - run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true) - - name: Test swift quickstart - run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true swift) + - name: Test quickstart + run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true ${{ matrix.swift }}) quickstart-ftl-cron-only: # Don't run on private repo. From 12b0f5ca9c3ad8293b6df882da2c290ac17a10ec Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 16 Feb 2024 08:38:24 -0800 Subject: [PATCH 2/3] Matrix verified, now disable --- .github/workflows/storage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index ead39f23f72a..ad5762a711f5 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -112,13 +112,15 @@ jobs: quickstart: # 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' + # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed. strategy: matrix: swift: [swift, ""] include: - os: macos-12 xcode: Xcode_14.2 - - os: macos-13 + - swift: swift + os: macos-13 xcode: Xcode_15.2 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} From e23cda2d18944efb7c83695374964583e9f1c7e5 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 16 Feb 2024 08:51:25 -0800 Subject: [PATCH 3/3] fix --- .github/workflows/storage.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index ad5762a711f5..d5ae8073ddf3 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -115,13 +115,15 @@ jobs: # TODO: See #12399 and restore Objective-C testing for Xcode 15 if GHA is fixed. strategy: matrix: - swift: [swift, ""] include: - os: macos-12 xcode: Xcode_14.2 - swift: swift os: macos-13 xcode: Xcode_15.2 + - swift: swift + os: macos-13 + xcode: Xcode_15.2 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}