Skip to content

Commit

Permalink
Merge 400f33c into 01a5fbf
Browse files Browse the repository at this point in the history
  • Loading branch information
endoze committed Mar 11, 2016
2 parents 01a5fbf + 400f33c commit 301568a
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 6 deletions.
2 changes: 2 additions & 0 deletions .slather.yml
@@ -1,6 +1,8 @@
ci_service: travis_ci
coverage_service: coveralls
xcodeproj: RosettaStoneKit.xcodeproj
scheme: RosettaStoneKit
source_directory: Common
ignore:
- Pods/*
- ../*
15 changes: 11 additions & 4 deletions .travis.yml
@@ -1,6 +1,13 @@
language: objective-c
osx_image: xcode7
before_install: rvm use $RVM_RUBY_VERSION
install: bundle install --without=documentation --path ../travis_bundle_dir
after_success: bundle exec slather
osx_image: xcode7.2

before_install:
- rvm use $RVM_RUBY_VERSION

install:
- bundle install --without=documentation --path ../travis_bundle_dir
- bundle exec pod install

script: script/ci

after_success: bundle exec slather
4 changes: 3 additions & 1 deletion RosettaStoneKit.xcodeproj/project.pbxproj
Expand Up @@ -608,6 +608,8 @@
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_GENERATE_TEST_COVERAGE_FILES = YES;
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
Expand Down Expand Up @@ -636,7 +638,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_CODE_COVERAGE = YES;
CLANG_ENABLE_CODE_COVERAGE = NO;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
Expand Down
4 changes: 3 additions & 1 deletion script/ci
@@ -1,7 +1,7 @@
#!/usr/bin/env bash

xcodebuild -configuration "Debug" \
-destination "name=iPhone 5,OS=9.0" \
-destination "name=iPhone 5,OS=9.2" \
-scheme "RosettaStoneKit" \
-workspace "RosettaStoneKit.xcworkspace" \
build test | \
Expand All @@ -11,3 +11,5 @@ xcodebuild -configuration "Debug" \
--screenshots \
--report junit \
--output "build/reports/test-report.xml"

bundle exec slather coverage -v

0 comments on commit 301568a

Please sign in to comment.