Skip to content

Commit

Permalink
style and more logging
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 committed Apr 11, 2024
1 parent 0c514d8 commit 0cb1f67
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 12 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,13 +89,8 @@ jobs:
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
- name: Initialize xcodebuild
run: scripts/setup_spm_tests.sh
- 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: Unit Tests
run: scripts/third_party/travis/retry.sh ./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

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/firestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,8 @@ jobs:
if: |
(github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') ||
(github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
runs-on: macos-14
# TODO: macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
runs-on: macos-12
needs: check

strategy:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/spectesting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,8 @@ jobs:
specs_testing:
needs: specs_checking
if: ${{ needs.specs_checking.outputs.podspecs != '[]' }}
runs-on: macos-14
# TODO: macOS 14 blocked on https://github.com/grpc/grpc/pull/36340
runs-on: macos-12
strategy:
fail-fast: false
matrix: ${{fromJson(needs.specs_checking.outputs.matrix)}}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
- name: Xcode
run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
- name: Test quickstart
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage true ${{ matrix.swift }})
run: ([ -z $plist_secret ] || scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Storage false ${{ matrix.swift }})

quickstart-ftl-cron-only:
# Don't run on private repo.
Expand Down
1 change: 1 addition & 0 deletions FirebaseSessions/Sources/FirebaseSessions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import Foundation
@_implementationOnly import FirebaseCoreExtension
@_implementationOnly import FirebaseInstallations
@_implementationOnly import GoogleDataTransport

#if swift(>=6.0)
internal import Promises
#elseif swift(>=5.10)
Expand Down
2 changes: 1 addition & 1 deletion SymbolCollisionTest/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ target 'SymbolCollisionTest' do
# pod 'google-cast-sdk' -- abseil
pod 'Google-Mobile-Ads-SDK'
pod 'GoogleAnalytics'
pod 'GoogleAppIndexing'
# pod 'GoogleAppIndexing' Fails to build with Xcode 15
pod 'GoogleAppUtilities'
pod 'GoogleAuthUtilities'
# pod 'GoogleConversionTracking' Fails to build with Xcode 15
Expand Down
5 changes: 4 additions & 1 deletion scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,12 @@ database_emulator="${scripts_dir}/run_database_emulator.sh"
system=$(uname -s)
case "$system" in
Darwin)
xcode_version=$(xcodebuild -version | head -n 1)
xcode_version=$(xcodebuild -version | grep Xcode)
echo $xcode_version
xcode_version="${xcode_version/Xcode /}"
echo $xcode_version
xcode_major="${xcode_version/.*/}"
echo $xcode_major
;;
*)
xcode_major="0"
Expand Down

0 comments on commit 0cb1f67

Please sign in to comment.