Skip to content

Commit a43a3e7

Browse files
committed
CI updates
1. Support xcpretty, for the pretty. 2. Test both Mac and iOS environments. Signed-off-by: Stephen Celis <stephen@stephencelis.com>
1 parent 833e9a3 commit a43a3e7

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

.travis.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
language: objective-c
22
osx_image: xcode61
3+
env:
4+
- BUILD_PLATFORM=iOS
5+
- BUILD_PLATFORM=Mac
6+
before_install:
7+
- gem install xcpretty --no-document
38
script:
4-
- xcodebuild -scheme 'SQLite iOS' test
9+
- make test

Makefile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@ BUILD_TOOL = xcodebuild
22
BUILD_PLATFORM ?= Mac
33
BUILD_ARGUMENTS = -scheme 'SQLite $(BUILD_PLATFORM)'
44

5+
XCPRETTY := $(shell command -v xcpretty)
6+
57
default: test
68

79
build:
810
$(BUILD_TOOL) $(BUILD_ARGUMENTS)
911

1012
test:
13+
ifdef XCPRETTY
14+
@set -o pipefail && $(BUILD_TOOL) $(BUILD_ARGUMENTS) test | $(XCPRETTY) -c
15+
else
1116
$(BUILD_TOOL) $(BUILD_ARGUMENTS) test
17+
endif
1218

1319
clean:
1420
$(BUILD_TOOL) $(BUILD_ARGUMENTS) clean

0 commit comments

Comments
 (0)