From 65d76800088c3fd11427d3cd52e5937f632bd46e Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Wed, 10 Apr 2024 15:44:06 -0700 Subject: [PATCH] fixes --- .github/workflows/database.yml | 9 +++++++-- .github/workflows/firebase_app_check.yml | 3 --- .github/workflows/functions.yml | 6 ++---- .github/workflows/health-metrics-presubmit.yml | 3 ++- .github/workflows/messaging.yml | 6 ++---- .github/workflows/sessions-integration-tests.yml | 3 ++- .github/workflows/spm.yml | 9 +++++++-- .github/workflows/storage.yml | 8 ++++---- .../ClientApp/ClientApp.xcodeproj/project.pbxproj | 8 ++++---- SymbolCollisionTest/Podfile | 2 +- 10 files changed, 31 insertions(+), 26 deletions(-) diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml index 309c80ffbc0..406b04b1429 100644 --- a/.github/workflows/database.yml +++ b/.github/workflows/database.yml @@ -89,8 +89,13 @@ jobs: run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer - name: Initialize xcodebuild run: scripts/setup_spm_tests.sh - - name: Unit Tests - run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnit ${{ matrix.target }} spm + - uses: nick-fields/retry@v3 + with: + timeout_minutes: 120 + max_attempts: 3 + retry_on: error + retry_wait_seconds: 120 + command: scripts/build.sh DatabaseUnit ${{ matrix.target }} spm - name: iOS Swift Unit Tests run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnitSwift ${{ matrix.target }} spm diff --git a/.github/workflows/firebase_app_check.yml b/.github/workflows/firebase_app_check.yml index 5ce8416d71c..c2775348cb3 100644 --- a/.github/workflows/firebase_app_check.yml +++ b/.github/workflows/firebase_app_check.yml @@ -25,13 +25,10 @@ jobs: target: [ios, tvos, macos --skip-tests, watchos] os: [macos-14, macos-13] include: - - os: macos-14 - xcode: Xcode_15.3 - os: macos-13 xcode: Xcode_15.2 - os: macos-14 xcode: Xcode_15.3 - target: visionOS runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/functions.yml b/.github/workflows/functions.yml index 7e2d4bb50d0..0d5654d40eb 100644 --- a/.github/workflows/functions.yml +++ b/.github/workflows/functions.yml @@ -90,14 +90,12 @@ jobs: target: [iOS, tvOS, macOS, catalyst, watchOS] os: [macos-13, macos-14] include: - - os: macos-14 - xcode: Xcode_15.3 - os: macos-13 xcode: Xcode_15.2 - os: macos-14 - xcode: Xcode_15.2 + xcode: Xcode_15.3 - os: macos-14 - xcode: Xcode_15.2 + xcode: Xcode_15.3 target: visionOS runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/health-metrics-presubmit.yml b/.github/workflows/health-metrics-presubmit.yml index e962f7ce9a6..f43ec329fde 100644 --- a/.github/workflows/health-metrics-presubmit.yml +++ b/.github/workflows/health-metrics-presubmit.yml @@ -244,7 +244,8 @@ jobs: needs: check # Don't run on private repo unless it is a PR. if: always() && github.repository == 'Firebase/firebase-ios-sdk' && (needs.check.outputs.performance_run_job == 'true'|| github.event.pull_request.merged) - runs-on: macos-14 + # TODO(#11903) Update to macos-14 + runs-on: macos-12 strategy: matrix: target: [iOS] diff --git a/.github/workflows/messaging.yml b/.github/workflows/messaging.yml index c80a862754d..d6a3234f127 100644 --- a/.github/workflows/messaging.yml +++ b/.github/workflows/messaging.yml @@ -86,14 +86,12 @@ jobs: target: [iOS, watchOS, tvOS, macOS, catalyst] os: [macos-13, macos-14] include: - - os: macos-14 - xcode: Xcode_15.3 - os: macos-13 xcode: Xcode_15.2 - os: macos-14 - xcode: Xcode_15.2 + xcode: Xcode_15.3 - os: macos-14 - xcode: Xcode_15.2 + xcode: Xcode_15.3 target: visionOS runs-on: ${{ matrix.os }} steps: diff --git a/.github/workflows/sessions-integration-tests.yml b/.github/workflows/sessions-integration-tests.yml index cafc5489978..1033bb6739a 100644 --- a/.github/workflows/sessions-integration-tests.yml +++ b/.github/workflows/sessions-integration-tests.yml @@ -25,7 +25,8 @@ jobs: if: github.repository == 'Firebase/firebase-ios-sdk' env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} - runs-on: macos-14 + #TODO: Fix macos-14 build issues + runs-on: macos-12 steps: - uses: actions/checkout@v4 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 diff --git a/.github/workflows/spm.yml b/.github/workflows/spm.yml index b1d7329e85c..2628cde075c 100644 --- a/.github/workflows/spm.yml +++ b/.github/workflows/spm.yml @@ -48,8 +48,13 @@ jobs: run: scripts/setup_spm_tests.sh - name: Functions Integration Test Server run: FirebaseFunctions/Backend/start.sh synchronous - - name: iOS Unit Tests - run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS ${{ matrix.test }} + - uses: nick-fields/retry@v3 + with: + timeout_minutes: 120 + max_attempts: 3 + retry_on: error + retry_wait_seconds: 120 + command: scripts/build.sh Firebase-Package iOS ${{ matrix.test }} # Test iOS Device build since some Firestore dependencies build different files. iOS-Device: diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml index f7ef1535299..a4fc95ea83f 100644 --- a/.github/workflows/storage.yml +++ b/.github/workflows/storage.yml @@ -96,11 +96,11 @@ jobs: strategy: matrix: include: - - os: macos-14 - xcode: Xcode_15.3 - - swift: swift - os: macos-13 + - os: macos-13 xcode: Xcode_15.2 + - swift: swift + os: macos-14 + xcode: Xcode_15.3 env: plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }} diff --git a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj index 5d948e53cab..674d6f05100 100644 --- a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj +++ b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj @@ -658,7 +658,7 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; @@ -701,7 +701,7 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; @@ -741,7 +741,7 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; @@ -777,7 +777,7 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.13; diff --git a/SymbolCollisionTest/Podfile b/SymbolCollisionTest/Podfile index f24b9e3bf57..fa57666cf26 100644 --- a/SymbolCollisionTest/Podfile +++ b/SymbolCollisionTest/Podfile @@ -51,7 +51,7 @@ target 'SymbolCollisionTest' do pod 'GoogleAuthUtilities' pod 'GoogleConversionTracking' pod 'GoogleDataTransport' - pod 'GoogleIDFASupport' +# pod 'GoogleIDFASupport' Fails to build with Xcode 15 pod 'GoogleInterchangeUtilities' pod 'GoogleMaps'