From 5cf121b2c20258f5fc025483ebbf94968f8f126e Mon Sep 17 00:00:00 2001
From: Ryan Davis <ryand-ruby@zenspider.com>
Date: Wed, 22 Jan 2020 18:49:43 -0800
Subject: [PATCH] Rework the build pipeline.

+ Separate out lint to its own stage.
+ Switch off of -stretch.
+ Switch 2.7 to final.
+ Default rake task is now just test.

Signed-off-by: Ryan Davis <zenspider@chef.io>
---
 .expeditor/buildkite/verify.sh |  3 +--
 .expeditor/verify.pipeline.yml | 16 ++++++++++++----
 Rakefile                       |  2 +-
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.expeditor/buildkite/verify.sh b/.expeditor/buildkite/verify.sh
index bc1b9a11..4ea48aae 100755
--- a/.expeditor/buildkite/verify.sh
+++ b/.expeditor/buildkite/verify.sh
@@ -20,5 +20,4 @@ echo "--- push bundle cache"
 push_bundle
 
 echo "+++ bundle exec rake"
-bundle exec rake
-
+bundle exec rake ${RAKE_TASK:-}
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 47180dd2..619c9e45 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -1,13 +1,21 @@
 ---
 steps:
 
+- label: lint-ruby-2.6
+  command:
+    - RAKE_TASK=lint /workdir/.expeditor/buildkite/verify.sh
+  expeditor:
+    executor:
+      docker:
+        image: ruby:2.6
+
 - label: run-tests-ruby-2.4
   command:
     - /workdir/.expeditor/buildkite/verify.sh
   expeditor:
     executor:
       docker:
-        image: ruby:2.4-stretch
+        image: ruby:2.4
 
 - label: run-tests-ruby-2.5
   command:
@@ -15,7 +23,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.5-stretch
+        image: ruby:2.5
 
 - label: run-tests-ruby-2.6
   command:
@@ -23,7 +31,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.6-stretch
+        image: ruby:2.6
 
 - label: run-tests-ruby-2.7
   command:
@@ -31,7 +39,7 @@ steps:
   expeditor:
     executor:
       docker:
-        image: ruby:2.7-rc
+        image: ruby:2.7
 
 - label: run-tests-ruby-2.6-windows
   command:
diff --git a/Rakefile b/Rakefile
index b118bb2b..3bd24cce 100755
--- a/Rakefile
+++ b/Rakefile
@@ -14,7 +14,7 @@ RuboCop::RakeTask.new(:lint) do |task|
 end
 
 # run tests
-task default: %i{test lint}
+task default: %i{test}
 
 Rake::TestTask.new do |t|
   t.libs << "test"