From c0ff4a46d97ab698d7c3a2ab686d7c21169bc2f7 Mon Sep 17 00:00:00 2001
From: Refael Ackermann <refack@gmail.com>
Date: Mon, 20 Aug 2018 10:05:28 -0400
Subject: [PATCH] build,tools: tweak the travis config

PR-URL: https://github.com/nodejs/node/pull/22417
Reviewed-By: George Adams <george.adams@uk.ibm.com>
Reviewed-By: Matheus Marchini <matheus@sthima.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Gibson Fahnestock <gibfahn@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
---
 .travis.yml | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 11cb2a2f12758b..a4444976b44cd1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,24 @@
 language: cpp
-compiler:
-  - clang
+compiler: clang
 sudo: false
-cache: ccache
+os: linux
 matrix:
   include:
-    - os: linux
+    - name: "Linter"
       node_js: "latest"
+      env: NODE=$(which node)
       install:
-        - NODE=$(which node) make lint-md-build
+        - make lint-md-build
       script:
-        - NODE=$(which node) make lint-ci
-    - os: linux
+        - make lint
+    - name: "Test Suite"
+      cache: ccache
       install:
         - ./configure
         - make -j2 V=
       script:
-        - make -j2 test-ci
-before_install:
-  - export CXX="ccache clang++ -Qunused-arguments"
-  - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option"
-  - export JOBS=2
+        - make -j2 test
+      before_install:
+        - export CXX="ccache clang++ -Qunused-arguments"
+        - export CC="ccache clang -Qunused-arguments -Wno-unknown-warning-option"
+        - export JOBS=2