Skip to content

Commit

Permalink
Rework the build pipeline.
Browse files Browse the repository at this point in the history
+ 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>
  • Loading branch information
zenspider committed Jan 28, 2020
1 parent 6a20f64 commit 5cf121b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .expeditor/buildkite/verify.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ echo "--- push bundle cache"
push_bundle

echo "+++ bundle exec rake"
bundle exec rake

bundle exec rake ${RAKE_TASK:-}
16 changes: 12 additions & 4 deletions .expeditor/verify.pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
---
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:
- /workdir/.expeditor/buildkite/verify.sh
expeditor:
executor:
docker:
image: ruby:2.5-stretch
image: ruby:2.5

- label: run-tests-ruby-2.6
command:
- /workdir/.expeditor/buildkite/verify.sh
expeditor:
executor:
docker:
image: ruby:2.6-stretch
image: ruby:2.6

- label: run-tests-ruby-2.7
command:
- /workdir/.expeditor/buildkite/verify.sh
expeditor:
executor:
docker:
image: ruby:2.7-rc
image: ruby:2.7

- label: run-tests-ruby-2.6-windows
command:
Expand Down
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 5cf121b

Please sign in to comment.