Skip to content

Commit

Permalink
fixes, workarounds, and logging
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 committed Apr 11, 2024
1 parent 65d7680 commit 0c514d8
Show file tree
Hide file tree
Showing 9 changed files with 21 additions and 10 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/firestore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ jobs:
(github.event_name == 'pull_request' && needs.changes.outputs.changed == 'true')
strategy:
matrix:
os: [macos-14, ubuntu-latest]
# TODO: Update to macos-14 which doesn't include Python 3.7
os: [macos-12, ubuntu-latest]

env:
MINT_PATH: ${{ github.workspace }}/mint
Expand Down Expand Up @@ -152,7 +153,8 @@ jobs:

strategy:
matrix:
os: [macos-14]
# TODO: Update to macos-14 which doesn't include Python 3.7
os: [macos-12]
databaseId: [(default), test-db]

env:
Expand Down Expand Up @@ -239,7 +241,8 @@ jobs:

strategy:
matrix:
os: [macos-14]
# TODO: Update to macos-14 which doesn't include Python 3.7
os: [macos-12]
sanitizer: [asan, tsan]

runs-on: ${{ matrix.os }}
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@ jobs:
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
LEGACY: true
runs-on: macos-14
# TODO: Move to macos-14 and Xcode 15. The legacy quickstart uses material which doesn't build on Xcode 15.
runs-on: macos-12

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
env:
plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
signin_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
runs-on: macos-14
runs-on: macos-12 # TODO: the legacy ObjC quickstarts don't run with Xcode 15.
steps:
- uses: actions/checkout@v4
- uses: ruby/setup-ruby@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
matrix:
include:
- os: macos-13
xcode: Xcode_15.2
xcode: Xcode_14.2 # TODO: the legacy ObjC quickstart doesn't build with Xcode 15.
- swift: swift
os: macos-14
xcode: Xcode_15.3
Expand Down
2 changes: 1 addition & 1 deletion FirebaseCoreInternal.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Pod::Spec.new do |s|
unit_tests.scheme = { :code_coverage => true }
unit_tests.platforms = {
:ios => ios_deployment_target,
:osx => osx_deployment_target,
:osx => '10.15',
:tvos => tvos_deployment_target
}
unit_tests.source_files = [
Expand Down
8 changes: 7 additions & 1 deletion FirebaseSessions/Sources/FirebaseSessions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,13 @@ import Foundation
@_implementationOnly import FirebaseCoreExtension
@_implementationOnly import FirebaseInstallations
@_implementationOnly import GoogleDataTransport
@_implementationOnly import Promises
#if swift(>=6.0)
internal import Promises
#elseif swift(>=5.10)
import Promises
#else
@_implementationOnly import Promises
#endif

private enum GoogleDataTransportConfig {
static let sessionsLogSource = "1974"
Expand Down
2 changes: 1 addition & 1 deletion SymbolCollisionTest/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ target 'SymbolCollisionTest' do
pod 'GoogleAppIndexing'
pod 'GoogleAppUtilities'
pod 'GoogleAuthUtilities'
pod 'GoogleConversionTracking'
# pod 'GoogleConversionTracking' Fails to build with Xcode 15
pod 'GoogleDataTransport'
# pod 'GoogleIDFASupport' Fails to build with Xcode 15
pod 'GoogleInterchangeUtilities'
Expand Down
1 change: 1 addition & 0 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function pod_gen() {
}

set -euo pipefail
set -x

if [[ $# -lt 1 ]]; then
cat 1>&2 <<EOF
Expand Down
2 changes: 1 addition & 1 deletion scripts/health_metrics/pod_test_code_coverage_report.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ else
# should be a targeted dir of actions/upload-artifact in workflows.
# In code coverage workflow, files under OUTPUT_PATH will be uploaded to
# GitHub Actions.
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb "${SDK}".podspec --platforms="$(tr '[:upper:]' '[:lower:]'<<<${PLATFORM})" --test-specs="${TEST_SPEC}"
scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb "${SDK}".podspec --verbose --platforms="$(tr '[:upper:]' '[:lower:]'<<<${PLATFORM})" --test-specs="${TEST_SPEC}"
fi

find /Users/runner/Library/Developer/Xcode/DerivedData -type d -regex ".*/.*\.xcresult" -execdir cp -R '{}' "${OUTPUT_PATH}" \;

0 comments on commit 0c514d8

Please sign in to comment.