feat: Tune travis (#1405)

Author: HazAT

.travis.yml

@@ -3,7 +3,7 @@ branches:
     - master
 
 install: true
-sudo: false
+sudo: required
 
 node_js:
   - "4"
@@ -18,65 +18,21 @@ language: node_js
 dist: trusty
 
 cache:
+  yarn: true
   directories:
-  - node_modules
+    - node_modules
 
-before_script:
-  - |
-      CHANGES=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))
-      if [ -n "$(grep 'raven-js' <<< "$CHANGES")" ]; then
-      RAVEN_JS_CHANGES=true
-      fi
-      if [ -n "$(grep 'raven-node' <<< "$CHANGES")" ]; then
-      RAVEN_NODE_CHANGES=true
-      fi
-      FORCE=$(git log --format=%B --no-merges -n 1)
-      if [ -n "$(grep '\[force ci\]' <<< "$FORCE")" ]; then
-      RAVEN_JS_CHANGES=true
-      RAVEN_NODE_CHANGES=true
-      fi
-
-env: NAME="raven-node"
-script:
-  - |
-      cd packages/raven-node
-      npm install
-      if [[ ("$RAVEN_NODE_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) && "$TRAVIS_SECURE_ENV_VARS" = "true" ]]; then
-      npm run test-full
-      else
-      npm run test
-      fi
+script: .travis/script.sh
 
 matrix:
   include:
-    - env: NAME="raven-js"
-      node_js: "8"
+    - node_js: "8"
+      script: .travis/lint.sh
+    - node_js: "8"
       addons:
         chrome: stable
         firefox: latest
         sauce_connect: true
-      script:
-        - |
-            cd packages/raven-js
-            npm install
-            npm run test
-            if [[ ("$RAVEN_JS_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) && "$TRAVIS_SECURE_ENV_VARS" = "true" ]]; then
-              npm run test:ci
-            fi
-
-    - env: NAME="@sentry -> lint"
-      before_install:
-        - curl -o- -L https://yarnpkg.com/install.sh | bash
-        - export PATH="$HOME/.yarn/bin:$PATH"
-      node_js: "8"
-      script: yarn && yarn build && yarn lint
-
-    - env: NAME="@sentry -> test"
-      before_install:
-        - curl -o- -L https://yarnpkg.com/install.sh | bash
-        - export PATH="$HOME/.yarn/bin:$PATH"
-      node_js: "8"
-      sudo: required
-      addons:
-        chrome: stable
-      script: yarn && yarn build && yarn test && yarn codecov
+      script: .travis/script.sh
+  exclude:
+    - node_js: "8"

.travis/before_script.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+
+CHANGES=$(git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD master))
+
+if [ -n "$(grep 'raven-js' <<< "$CHANGES")" ]; then
+  RAVEN_JS_CHANGES=true
+fi
+
+if [ -n "$(grep 'raven-node' <<< "$CHANGES")" ]; then
+  RAVEN_NODE_CHANGES=true
+fi
+
+FORCE=$(git log --format=%B --no-merges -n 1)
+
+if [ -n "$(grep '\[force ci\]' <<< "$FORCE")" ]; then
+  RAVEN_JS_CHANGES=true
+  RAVEN_NODE_CHANGES=true
+fi
+
+NODE_VERSION=$(node -v);

.travis/lint.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+set -e
+
+source .travis/before_script.sh
+
+# Run @sentry/*
+yarn && yarn build && yarn lint
+
+# Run raven-node
+if [[ ("$RAVEN_NODE_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then
+  cd packages/raven-node
+  npm install
+  npm run lint
+  cd ../..
+fi
+
+# Run raven-js
+if [[ ("$RAVEN_JS_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then
+  cd packages/raven-js
+  npm install
+  npm run lint
+  cd ../..
+fi

.travis/script.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+set -e
+
+source .travis/before_script.sh
+
+# Run raven-node
+if [[ ("$RAVEN_NODE_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) ]]; then
+  cd packages/raven-node
+  npm install
+  if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" ]]; then
+    npm run test-full
+  else
+    npm run test
+  fi
+  cd ../..
+fi
+
+# Run raven-js
+if [[ ("$RAVEN_JS_CHANGES" = "true" || "$TRAVIS_PULL_REQUEST" = "false" ) && ${NODE_VERSION:1:1} -eq 8 ]]; then
+  cd packages/raven-js
+  npm install
+  npm run test
+  if [[ "$TRAVIS_SECURE_ENV_VARS" = "true" ]]; then
+    npm run test:ci
+  fi
+  cd ../..
+fi
+
+# Run @sentry/*
+if [ ${NODE_VERSION:1:1} -gt 5 ]; then
+  yarn && yarn build && yarn test && yarn codecov
+fi

packages/raven-js/package.json

@@ -24,7 +24,7 @@
     "test:integration-sauce": "karma start karma/karma.integration-sauce.config.js",
     "test:loader": "karma start karma/karma.loader.config.js",
     "test:loader-sauce": "karma start karma/karma.loader-sauce.config.js",
-    "test:typescript": "tsc --noEmit --noImplicitAny typescript/raven-tests.ts",
+    "test:typescript": "tsc -p tsconfig.json",
     "test:ci": "npm run lint && grunt test:ci && npm run test:loader-sauce && npm run test:integration-sauce",
     "test:size": "grunt dist && bundlesize && git checkout -- dist/",
     "loader": "cat src/loader.js | sed '/build_marker/{N;d;}' | npx google-closure-compiler-js | perl -e \"print ';'; print <STDIN>;\""

packages/raven-js/tsconfig.json

@@ -0,0 +1,9 @@
+{
+  "include": ["typescript/raven-tests.ts"],
+  "compilerOptions": {
+    "baseUrl": "./typescript",
+    "types": [],
+    "noEmit": true,
+    "noImplicitAny": true
+  }
+}