From a01cfd0f9593052e89288045a3c3133d3ab2bcfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Fri, 12 Jan 2018 21:57:43 -0800
Subject: [PATCH 1/4] Use YAML anchors to deduplicate common stage variables

---
 .travis.yml | 49 +++++++++++++++++++++----------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ea53a6dad..09eaeb54f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,52 +1,45 @@
 go_import_path: github.com/cloudflare/unsee
 
+defaults_go: &DEFAULTS_GO
+  language: go
+  go: "1.9.2"
+  cache:
+    directories:
+      - vendor
+
+defaults_js: &DEFAULTS_JS
+  language: node_js
+  node_js: "8"
+  # install defaults to "npm install", which is done via make
+  install: []
+  cache:
+    directories:
+      - node_modules
+
 jobs:
   include:
     - stage: Lint docs
-      language: node_js
-      node_js: "8"
-      cache:
-        directories:
-          - node_modules
-      # install defaults to "npm install", which is done via make
-      install: []
+      <<: *DEFAULTS_JS
       script: make lint-docs
 
     - stage: Test Go code
-      language: go
-      go:  "1.9.2"
+      <<: *DEFAULTS_GO
       before_script:
         - make mock-assets
-      cache:
-        directories:
-          - vendor
       script: make test-go
 
     - stage: Test JavaScript code
-      language: node_js
-      node_js: "8"
+      <<: *DEFAULTS_JS
       env:
         - NODE_ENV=test
-      cache:
-        directories:
-          - node_modules
-      # install defaults to "npm install", which is done via make
-      install: []
       script: make test-js
 
     - stage: Lint Go code
-      language: go
-      go:  "1.9.2"
+      <<: *DEFAULTS_GO
       script: make lint-go
 
     - stage: Lint JavaScript code
-      language: node_js
-      node_js: "8"
-      cache:
-        directories:
-          - node_modules
-      # install defaults to "npm install", which is done via make
-      install: []
+      <<: *DEFAULTS_JS
       script: make lint-js
 
     - stage: Build Docker image

From 33f5d91044f5416209c0235f66d9e65d8dac0ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Sat, 20 Jan 2018 23:07:35 -0800
Subject: [PATCH 2/4] Drop go_import_path from .travis.yml

Travis linter doesn't recognize this key and it's a global, which makes no sense with stages and anchors
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 09eaeb54f..9cbfc7139 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-go_import_path: github.com/cloudflare/unsee
-
 defaults_go: &DEFAULTS_GO
   language: go
   go: "1.9.2"

From 4fb7afa0bb87480408cf86b43a63ce5518912ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Sat, 20 Jan 2018 23:08:01 -0800
Subject: [PATCH 3/4] Use 'generic' language for docker stage

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 9cbfc7139..9f29f6ecc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,6 +41,7 @@ jobs:
       script: make lint-js
 
     - stage: Build Docker image
+      language: generic
       sudo: true
       addons:
         apt:

From fafe6d7bf1056141c3e1918212bf2c8371c5af70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= <l.mierzwa@gmail.com>
Date: Sat, 20 Jan 2018 23:19:58 -0800
Subject: [PATCH 4/4] Move lint docs stage closer to other lint stages

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9f29f6ecc..2c5f3af17 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,6 @@ defaults_js: &DEFAULTS_JS
 
 jobs:
   include:
-    - stage: Lint docs
-      <<: *DEFAULTS_JS
-      script: make lint-docs
-
     - stage: Test Go code
       <<: *DEFAULTS_GO
       before_script:
@@ -40,6 +36,10 @@ jobs:
       <<: *DEFAULTS_JS
       script: make lint-js
 
+    - stage: Lint docs
+      <<: *DEFAULTS_JS
+      script: make lint-docs
+
     - stage: Build Docker image
       language: generic
       sudo: true