summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Fischer <joeljfischer@gmail.com>2019-12-06 11:24:10 -0500
committerJoel Fischer <joeljfischer@gmail.com>2019-12-06 11:24:10 -0500
commitf57c9056c1505a742a9e3556c05f94e29dd99112 (patch)
treea304e5c65c741a864b492a72b52c8ca9e4513f3d
parentf7a222c7cdde7bd2d6dcbb6e0721b88eda1025b9 (diff)
downloadsdl_ios-bugfix/issue-1488-travis-failing.tar.gz
Only upload code cov on successbugfix/issue-1488-travis-failing
-rw-r--r--.travis.yml4
-rw-r--r--SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme26
2 files changed, 13 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 257629961..ffe2705b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,5 +22,5 @@ script:
- set -o pipefail && xcodebuild -project "SmartDeviceLink-iOS.xcodeproj" -scheme "SmartDeviceLink-Example-Swift" -destination "platform=iOS Simulator,OS=13.2.2,name=iPhone 11" -configuration Debug ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO build | xcpretty -c;
- set -o pipefail && xcodebuild -project "SmartDeviceLink-iOS.xcodeproj" -scheme "SmartDeviceLink" -destination "platform=iOS Simulator,OS=13.2.2,name=iPhone 11" -configuration Debug ONLY_ACTIVE_ARCH=NO RUN_CLANG_STATIC_ANALYZER=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES ENABLE_TESTABILITY=YES test | xcpretty -c;
-after_script:
-- bash <(curl -s https://codecov.io/bash)
+after_success:
+- bash <(curl -s https://codecov.io/bash) -J 'SmartDeviceLink'
diff --git a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme
index 6f8818b13..5c1bda670 100644
--- a/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme
+++ b/SmartDeviceLink-iOS.xcodeproj/xcshareddata/xcschemes/SmartDeviceLink.xcscheme
@@ -26,9 +26,18 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+ shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES"
- onlyGenerateCoverageForSpecifiedTargets = "YES"
- shouldUseLaunchSchemeArgsEnv = "YES">
+ onlyGenerateCoverageForSpecifiedTargets = "YES">
+ <MacroExpansion>
+ <BuildableReference
+ BuildableIdentifier = "primary"
+ BlueprintIdentifier = "5D61FA1B1A84237100846EE7"
+ BuildableName = "SmartDeviceLink.framework"
+ BlueprintName = "SmartDeviceLink"
+ ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj">
+ </BuildableReference>
+ </MacroExpansion>
<CodeCoverageTargets>
<BuildableReference
BuildableIdentifier = "primary"
@@ -50,17 +59,6 @@
</BuildableReference>
</TestableReference>
</Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "5D61FA1B1A84237100846EE7"
- BuildableName = "SmartDeviceLink.framework"
- BlueprintName = "SmartDeviceLink"
- ReferencedContainer = "container:SmartDeviceLink-iOS.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- <AdditionalOptions>
- </AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@@ -88,8 +86,6 @@
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
- <AdditionalOptions>
- </AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Debug"