From 2104327ba1eec01c810721bd3140a6fb24998ab9 Mon Sep 17 00:00:00 2001
From: Ben Alpert <spicyjalapeno@gmail.com>
Date: Sat, 23 Nov 2013 15:48:25 -0500
Subject: [PATCH] Run lint automatically on Travis (in a matrix)

---
 .travis.yml  | 32 ++++++++++++++++++++++++++++----
 package.json |  3 ---
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0f00ae082c..053b90d2a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,33 @@
 language: node_js
 node_js:
 - '0.10'
+script:
+- |
+    if [ "$TEST_TYPE" = unit ]; then
+      grunt build && grunt test
+    else
+      grunt lint
+    fi
 after_script:
-- curl -F "react=@build/react.js" -F "react.min=@build/react.min.js" -F "transformer=@build/JSXTransformer.js"
-  -F "react-with-addons=@build/react-with-addons.js" -F "react-with-addons.min=@build/react-with-addons.min.js"
-  -F "commit=$TRAVIS_COMMIT" -F "date=`git log --format='%ct' -1`" -F "pull_request=$TRAVIS_PULL_REQUEST"
-  -F "token=$SECRET_TOKEN" -F "branch=$TRAVIS_BRANCH" $SERVER
+- |
+    if [ "$TEST_TYPE" = unit ] && [ "$SERVER" ]; then
+      curl \
+        -F "react=@build/react.js" \
+        -F "react.min=@build/react.min.js" \
+        -F "transformer=@build/JSXTransformer.js" \
+        -F "react-with-addons=@build/react-with-addons.js" \
+        -F "react-with-addons.min=@build/react-with-addons.min.js" \
+        -F "commit=$TRAVIS_COMMIT" \
+        -F "date=`git log --format='%ct' -1`" \
+        -F "pull_request=$TRAVIS_PULL_REQUEST" \
+        -F "token=$SECRET_TOKEN" \
+        -F "branch=$TRAVIS_BRANCH" \
+        $SERVER
+    fi
 env:
+  matrix:
+  - TEST_TYPE=unit
+  - TEST_TYPE=lint
   global:
   # SERVER
   - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
@@ -15,3 +36,6 @@ env:
   - secure: dkpPW+VnoqC/okhRdV90m36NcyBFhcwEKL3bNFExAwi0dXnFao8RoFlvnwiPlA23h2faROkMIetXlti6Aju08BgUFV+f9aL6vLyU7gUent4Nd3413zf2fwDtXIWIETg6uLnOpSykGKgCAT/hY3Q2oPLqOoY0OxfgnbqwxkxljrE=
   - secure: eHMg4yQWJ+5zFxNcjVwpdpcbZCQMaSByqJy0wwQ2XOOMItdCvSfO/fa+mYoVND/9Orsi5kvXC9tx4sYHyth5hLrvO+bghYjiayrbxYYrxso6G/aU8Pttc7s/qk3I4zadLlua1kGy2TauByxS6nt9nUDe0FDaJKA9k1QXVlpq5Ac=
   - secure: v65jUPPNBvJg1xhj4cY7wMKinCESUseHsW1d2gp68SluFHHyjWZOvXYXZdABqB/1uNmQxjbUkwkdSNAOn5k7ppjRcRnlAH2uu1xDqXrGp6cW4MfNPchrAe+FcUMtse/3THGJj8SZ9IQWIl+BHv4XASQ7FwqCR8cwlOfhsqdfch8=
+matrix:
+  allow_failures:
+    - env: TEST_TYPE=lint
diff --git a/package.json b/package.json
index 661fc7c044..3c8c941e73 100644
--- a/package.json
+++ b/package.json
@@ -32,9 +32,6 @@
     "type": "git",
     "url": "https://github.com/facebook/react"
   },
-  "scripts": {
-    "test": "grunt build && grunt test"
-  },
   "dependencies": {
     "commoner": "~0.8.7",
     "esprima-fb": "~2001.1001.0-dev-harmony-fb",