Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweak the CI scripts a bit #93

Merged
merged 4 commits into from
Feb 10, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .slather.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
coverage_service: coveralls
ci_service: travis_ci
xcodeproj: SPTDataLoader.xcodeproj
scheme: SPTDataLoader
ignore:
- "../**/Developer/*"
- "SPTDataLoaderTests/*"
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ env:
- PROJECT_LIBRARY="SPTDataLoader.xcodeproj"
- PROJECT_DEMO="SPTDataLoaderDemo.xcodeproj"
- PROJECT_FRAMEWORK="SPTDataLoaderFramework.xcodeproj"
- PODSPEC="SPTDataLoader.podspec"
matrix:
- TEST_SDK=iphonesimulator TEST_DEST="platform=iOS Simulator,OS=8.1,name=iPhone 6" SCHEME="$SCHEME_IOS_LIBRARY" BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
- TEST_SDK=iphonesimulator TEST_DEST="platform=iOS Simulator,OS=8.2,name=iPhone 4s" SCHEME="$SCHEME_IOS_LIBRARY" BUILD_ACTIONS="$BUILD_TEST" EXTRA_ARGUMENTS="$ENABLE_CODE_COVERAGE" PROJECT="$PROJECT_LIBRARY"
Expand Down
4 changes: 1 addition & 3 deletions ci/after_success.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,5 @@ set -euo pipefail

travis_fold_open "Slather" "Publishing test coverage data…"
bundle exec slather coverage \
--input-format profdata \
--scheme SPTDataLoader \
SPTDataLoader.xcodeproj
--input-format profdata
travis_fold_close "Slather"
3 changes: 3 additions & 0 deletions ci/lib/travis_helpers.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Make sure we can execute this even if the `TRAVIS` variable isn’t set. It should default to false.
: ${TRAVIS:=false}

# Opens a Travis-CI fold, iff we’re running on Travis-CI.
#
# @param $1 The name of the fold, should be matched by a call to travis_fold_close() with the same
Expand Down
2 changes: 1 addition & 1 deletion ci/script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ done

# Linting
travis_fold_open "Linting" "Linting CocoaPods specification…"
pod spec lint SPTDataLoader.podspec --quick
pod spec lint "$PODSPEC" --quick
travis_fold_close "Linting"