Merge pull request Quick#483 from mokagio/mokagio/update-xctool-ci-setup

Enable xctool for OS X target in CI
john-langley · Feb 14, 2016 · 07a5e87 · 07a5e87
2 parents 2f03756 + 8fe0b3d
commit 07a5e87
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 19 deletions.
diff --git a/circle.yml b/circle.yml
@@ -8,21 +8,14 @@ checkout:
 
 dependencies:
   pre:
-    # There is a bug in a formula resulting in update failing if run once, but not the second time
-    # See https://github.com/Homebrew/homebrew/issues/45616
-    - brew update || brew update
+    - brew update
     - brew outdated xctool || brew upgrade xctool
 
 test:
   override:
     - rake test:ios
     - rake test:osx
     - rake test:xctool:ios
-    # Due to the `pending` specs using a `print` xctool fails generating the report,
-    # which in turn makes the tests fail.
-    # See https://github.com/facebook/xctool/issues/314#issuecomment-152988101 and comments
-    # for details.
-    # See https://circleci.com/gh/mokagio/Quick/12 for a proof that without `print` the test pass.
-    # - rake test:xctool_osx
+    - rake test:xctool:osx
 
 
diff --git a/script/travis-install-osx b/script/travis-install-osx
@@ -3,7 +3,5 @@ set -e
 
 git submodule update --init --recursive
 
-# There is a bug in a formula resulting in update failing if run once, but not the second time
-# See https://github.com/Homebrew/homebrew/issues/45616
-brew update || brew update
+brew update
 brew outdated xctool || brew upgrade xctool
diff --git a/script/travis-script-osx b/script/travis-script-osx
@@ -3,10 +3,4 @@
 rake test:ios
 rake test:osx
 rake test:xctool:ios
-
-# Due to the `pending` specs using a `print` xctool fails generating the report,
-# which in turn makes the tests fail.
-# See https://github.com/facebook/xctool/issues/314#issuecomment-152988101 and comments
-# for details.
-# See https://circleci.com/gh/mokagio/Quick/12 for a proof that without `print` the test pass.
-#rake test:xctool:osx
+rake test:xctool:osx