Merge pull request #1290 from CvX/travis-improvement

Travis config improvements

Author: Turbo87

.travis.yml

@@ -4,18 +4,19 @@ dist: trusty
 
 branches:
   except:
-  - staging.tmp
+    - staging.tmp
 
 cache:
   cargo: true
-
-addons:
-  chrome: stable
+  directories:
+    - $HOME/.npm
 
 env:
   global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
+    - JOBS=1 # See https://git.io/vdao3 for details.
+    - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
+    - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
+    - CARGO_TARGET_DIR=target
 
 before_install:
   - nvm install 8
@@ -27,6 +28,7 @@ before_script:
   - diesel database setup
 
 addons:
+  chrome: stable
   postgresql: "9.5"
   apt:
     sources:
@@ -42,32 +44,26 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2018-02-13
-    script:
-    - cargo install --force rustfmt-nightly --vers 0.3.6
-    - cargo fmt -- --write-mode=diff
-    - cargo install --force clippy --vers 0.0.186
-    - cargo clippy
-  - rust: stable
-    script:
-    - cargo build
-    - cargo test
-    - npm install
-    - npm test
-  - rust: beta
-    script:
-    - cargo build
-    - cargo test
-  - rust: nightly
-    script:
-    - cargo build
-    - cargo test
-
-env:
-  global:
-    - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
-    - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
-    - CARGO_TARGET_DIR=target
+    - rust: nightly-2018-02-13
+      script:
+        - cargo install --force rustfmt-nightly --vers 0.3.6
+        - cargo fmt -- --write-mode=diff
+        - cargo install --force clippy --vers 0.0.186
+        - cargo clippy
+    - rust: stable
+      script:
+        - cargo build
+        - cargo test
+        - npm install
+        - npm test
+    - rust: beta
+      script:
+        - cargo build
+        - cargo test
+    - rust: nightly
+      script:
+        - cargo build
+        - cargo test
 
 notifications:
   email: