Merge pull request #1203 from liuxuan30/fixTravis

upgrade carthage, resolve test failure config
ChartsOrg · Jul 1, 2016 · 1b60553 · 1b60553
2 parents c5c442b + 31e9cff
commit 1b60553
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,6 +10,7 @@ cache:
 
 before_install:
   - brew update
+  - brew upgrade carthage
   - cd Charts && carthage bootstrap
 
 script:

diff --git a/Charts/Cartfile.resolved b/Charts/Cartfile.resolved
@@ -1 +1 @@
-github "facebook/ios-snapshot-test-case" "2.1.1"
+github "facebook/ios-snapshot-test-case" "040817b1295a91fc239d8433a087d7b50bfa5dd6"
diff --git a/Rakefile b/Rakefile
@@ -13,7 +13,7 @@ end
 def test_targets
   [
     :ios,
-    :tvos
+    # :tvos #no tvOS fbsnapshot
   ]
 end
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		github "facebook/ios-snapshot-test-case" "2.1.1"
		github "facebook/ios-snapshot-test-case" "040817b1295a91fc239d8433a087d7b50bfa5dd6"
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ end @@
     def test_targets
       [
         :ios,
-        :tvos
+        # :tvos #no tvOS fbsnapshot
       ]
     end
@@ Expand Down @@