Skip to content

Commit 65d7680

Browse files
paulb777paulb777
committed
fixes
1 parent 43e4bce commit 65d7680

File tree

10 files changed

+31
-26
lines changed

10 files changed

+31
-26
lines changed

‎.github/workflows/database.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,13 @@ jobs:
8989
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
9090
- name: Initialize xcodebuild
9191
run: scripts/setup_spm_tests.sh
92-
- name: Unit Tests
93-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnit ${{ matrix.target }} spm
92+
- uses: nick-fields/retry@v3
93+
with:
94+
timeout_minutes: 120
95+
max_attempts: 3
96+
retry_on: error
97+
retry_wait_seconds: 120
98+
command: scripts/build.sh DatabaseUnit ${{ matrix.target }} spm
9499
- name: iOS Swift Unit Tests
95100
run: scripts/third_party/travis/retry.sh ./scripts/build.sh DatabaseUnitSwift ${{ matrix.target }} spm
96101

‎.github/workflows/firebase_app_check.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,10 @@ jobs:
2525
target: [ios, tvos, macos --skip-tests, watchos]
2626
os: [macos-14, macos-13]
2727
include:
28-
- os: macos-14
29-
xcode: Xcode_15.3
3028
- os: macos-13
3129
xcode: Xcode_15.2
3230
- os: macos-14
3331
xcode: Xcode_15.3
34-
target: visionOS
3532
runs-on: ${{ matrix.os }}
3633
steps:
3734
- uses: actions/checkout@v4

‎.github/workflows/functions.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,12 @@ jobs:
9090
target: [iOS, tvOS, macOS, catalyst, watchOS]
9191
os: [macos-13, macos-14]
9292
include:
93-
- os: macos-14
94-
xcode: Xcode_15.3
9593
- os: macos-13
9694
xcode: Xcode_15.2
9795
- os: macos-14
98-
xcode: Xcode_15.2
96+
xcode: Xcode_15.3
9997
- os: macos-14
100-
xcode: Xcode_15.2
98+
xcode: Xcode_15.3
10199
target: visionOS
102100
runs-on: ${{ matrix.os }}
103101
steps:

‎.github/workflows/health-metrics-presubmit.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@ jobs:
244244
needs: check
245245
# Don't run on private repo unless it is a PR.
246246
if: always() && github.repository == 'Firebase/firebase-ios-sdk' && (needs.check.outputs.performance_run_job == 'true'|| github.event.pull_request.merged)
247-
runs-on: macos-14
247+
# TODO(#11903) Update to macos-14
248+
runs-on: macos-12
248249
strategy:
249250
matrix:
250251
target: [iOS]

‎.github/workflows/messaging.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,14 +86,12 @@ jobs:
8686
target: [iOS, watchOS, tvOS, macOS, catalyst]
8787
os: [macos-13, macos-14]
8888
include:
89-
- os: macos-14
90-
xcode: Xcode_15.3
9189
- os: macos-13
9290
xcode: Xcode_15.2
9391
- os: macos-14
94-
xcode: Xcode_15.2
92+
xcode: Xcode_15.3
9593
- os: macos-14
96-
xcode: Xcode_15.2
94+
xcode: Xcode_15.3
9795
target: visionOS
9896
runs-on: ${{ matrix.os }}
9997
steps:

‎.github/workflows/sessions-integration-tests.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ jobs:
2525
if: github.repository == 'Firebase/firebase-ios-sdk'
2626
env:
2727
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
28-
runs-on: macos-14
28+
#TODO: Fix macos-14 build issues
29+
runs-on: macos-12
2930
steps:
3031
- uses: actions/checkout@v4
3132
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

‎.github/workflows/spm.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@ jobs:
4848
run: scripts/setup_spm_tests.sh
4949
- name: Functions Integration Test Server
5050
run: FirebaseFunctions/Backend/start.sh synchronous
51-
- name: iOS Unit Tests
52-
run: scripts/third_party/travis/retry.sh ./scripts/build.sh Firebase-Package iOS ${{ matrix.test }}
51+
- uses: nick-fields/retry@v3
52+
with:
53+
timeout_minutes: 120
54+
max_attempts: 3
55+
retry_on: error
56+
retry_wait_seconds: 120
57+
command: scripts/build.sh Firebase-Package iOS ${{ matrix.test }}
5358

5459
# Test iOS Device build since some Firestore dependencies build different files.
5560
iOS-Device:

‎.github/workflows/storage.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,11 @@ jobs:
9696
strategy:
9797
matrix:
9898
include:
99-
- os: macos-14
100-
xcode: Xcode_15.3
101-
- swift: swift
102-
os: macos-13
99+
- os: macos-13
103100
xcode: Xcode_15.2
101+
- swift: swift
102+
os: macos-14
103+
xcode: Xcode_15.3
104104
env:
105105
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
106106
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}

‎IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@
658658
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
659659
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
660660
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
661-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
661+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
662662
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
663663
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
664664
MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -701,7 +701,7 @@
701701
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
702702
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
703703
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
704-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
704+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
705705
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
706706
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
707707
MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -741,7 +741,7 @@
741741
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
742742
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
743743
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
744-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
744+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
745745
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
746746
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
747747
MACOSX_DEPLOYMENT_TARGET = 10.13;
@@ -777,7 +777,7 @@
777777
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
778778
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
779779
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
780-
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
780+
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
781781
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
782782
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
783783
MACOSX_DEPLOYMENT_TARGET = 10.13;

‎SymbolCollisionTest/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ target 'SymbolCollisionTest' do
5151
pod 'GoogleAuthUtilities'
5252
pod 'GoogleConversionTracking'
5353
pod 'GoogleDataTransport'
54-
pod 'GoogleIDFASupport'
54+
# pod 'GoogleIDFASupport' Fails to build with Xcode 15
5555
pod 'GoogleInterchangeUtilities'
5656
pod 'GoogleMaps'
5757

0 commit comments

Comments
 (0)