Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.

Commit 41666f5

Browse files
author
Marin Usalj
committed
update Makefile
1 parent c75a56e commit 41666f5

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

.travis.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
rvm: 2.0.0
21
language: objective-c
32

43
before_install:
54
- cd Example
65

6+
install: make install
7+
78
script: make ci
9+

Example/Makefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@ PROJECT_NAME=SampleProject
22
WORKSPACE=$(PROJECT_NAME).xcworkspace
33
DEFAULT_SCHEME=$(PROJECT_NAME)
44
DEFAULT_FLAGS=-sdk iphonesimulator
5-
BUILD_TOOL=xcodebuild
6-
DEFAULT_TASK=$(BUILD_TOOL) -workspace $(WORKSPACE) -scheme $(DEFAULT_SCHEME) $(DEFAULT_FLAGS)
5+
TESTING_TOOL=xcodebuild
6+
7+
DEFAULT_TASK=$(TESTING_TOOL) -workspace $(WORKSPACE) -scheme $(DEFAULT_SCHEME) $(DEFAULT_FLAGS)
78

89
clean:
910
$(DEFAULT_TASK) clean
1011

1112
test:
12-
$(DEFAULT_TASK) test | xcpretty -c
13+
$(DEFAULT_TASK) test | xcpretty -tc
1314

14-
install_pods:
15+
install:
16+
gem install cocoapods --no-ri --no-rdoc
17+
gem install xcpretty --no-ri --no-rdoc
1518
pod install
1619

17-
update_tools:
18-
gem install cocoapods
19-
gem install xcpretty
20-
21-
ci: update_tools install_pods test
20+
ci:
21+
$(DEFAULT_TASK) test | xcpretty -c
2222

0 commit comments

Comments
 (0)