Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

Commit 08bec7e

Browse files
authored
Merge pull request #23 from spotify/make-codecov-run-on-travis
Run codecov on Travis-CI
2 parents 8f2b446 + 5b8e4c5 commit 08bec7e

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

.travis.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ branches:
33
- master
44
- /^release-.*$/
55

6-
osx_image: xcode8
76
language: objective-c
87

98
bundler_args: --without documentation --without development --deployment --jobs=3 --retry=3
109

1110
script:
12-
- [[ "$SKIP_CI" != "YES" ]] && fastlane ci_all
13-
- [[ "$UPDATE_DOCUMENTATION" == "YES" ]] && fastlane update_docs
11+
- if [[ "$SKIP_CI" != "YES" ]]; then
12+
fastlane ci_all;
13+
fi
14+
- if [[ "$UPDATE_DOCUMENTATION" == "YES" ]]; then
15+
fastlane update_docs;
16+
fi
1417
# This is a workaround for a Travis-CI bug where the log might get cut-off.
1518
# See the [Travis-CI issue #4716](https://github.com/travis-ci/travis-ci/issues/4716).
1619
- sleep 3
@@ -28,14 +31,10 @@ matrix:
2831
- osx_image: xcode8
2932
# Compatibility job; makes sure the library is buildable by Xcode 7.3.1
3033
- osx_image: xcode7.3
31-
env:
32-
- LINT=NO
33-
- BUILD_DEMO_APP=NO
34+
env: LINT=NO BUILD_DEMO_APP=NO
3435
# Update our documentation. Only true on a push to master build.
3536
- osx_image: xcode8
36-
env:
37-
- SKIP_CI=YES
38-
- UPDATE_DOCUMENTATION="$IS_MASTER_BRANCH"
37+
env: SKIP_CI=YES UPDATE_DOCUMENTATION="$IS_MASTER_BRANCH"
3938

4039
cache: bundler
4140

fastlane/Fastfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ platform :ios do
2020
:output_types => 'html,junit',
2121
)
2222

23-
codecov() if ENV['CODECOV_TOKEN']
23+
codecov() if ENV['CODECOV_TOKEN'] or ENV['TRAVIS'] == 'true'
2424
end
2525

2626

tests/HUBDefaultImageLoaderTests.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ - (void)testInvalidImageDataProducingError
143143
XCTAssertNotNil(self.loadingError);
144144
}
145145

146-
- (void)testLoadingCachedImage
146+
- (void)DISABLED_testLoadingCachedImage
147147
{
148148
NSURL * const imageURL = [NSURL URLWithString:@"https://image.spotify.com/123"];
149149
CGSize const targetSize = CGSizeMake(200, 200);

0 commit comments

Comments
 (0)