Merge pull request robb#132 from robb/travis-ci

Restore .travis.yml
tonyli508 · May 30, 2015 · d70cbe5 · d70cbe5
2 parents beaa857 + c79256f
commit d70cbe5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,11 @@
+language: objective-c
+osx_image: beta-xcode6.3
+before_install:
+    - brew update
+    - brew install carthage || brew outdated carthage || brew upgrade carthage
+install:
+    - gem install xcpretty
+    - carthage bootstrap
+script:
+    - set -o pipefail && xcodebuild -scheme 'Cartography-Mac' test | xcpretty -c
+    - set -o pipefail && xcodebuild -scheme 'Cartography-iOS' test | xcpretty -c
diff --git a/Cartfile.private b/Cartfile.private
@@ -1,2 +1,2 @@
-github "Quick/Nimble" ~> 0.4.2
+github "Quick/Nimble" ~> 1.0
 github "Quick/Quick" ~> 0.3.1
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -1,2 +1,2 @@
-github "Quick/Nimble" "v0.4.2"
+github "Quick/Nimble" "v1.0.0-rc.1"
 github "Quick/Quick" "v0.3.1"