diff options
| author | Tim Smith <tsmith@chef.io> | 2021-02-11 22:37:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 22:37:59 -0800 |
| commit | cd26aebfb491b8d429f6206567649613b0befd2f (patch) | |
| tree | adbfc74288b9ef898c23660b26443c9273d713f9 | |
| parent | fec41da4f12db77eaee1ac56a8ddc84e53db7acd (diff) | |
| parent | 3dcff1176090a731c254841e3b7f10ea1253ad47 (diff) | |
| download | mixlib-shellout-cd26aebfb491b8d429f6206567649613b0befd2f.tar.gz | |
Merge pull request #228 from chef/ruby3_time
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rwxr-xr-x | .expeditor/run_linux_tests.sh | 1 | ||||
| -rw-r--r-- | .expeditor/verify.pipeline.yml | 8 | ||||
| -rw-r--r-- | Gemfile | 10 |
3 files changed, 14 insertions, 5 deletions
diff --git a/.expeditor/run_linux_tests.sh b/.expeditor/run_linux_tests.sh index 7df1936..fc2f6b2 100755 --- a/.expeditor/run_linux_tests.sh +++ b/.expeditor/run_linux_tests.sh @@ -8,7 +8,6 @@ export USER="root" export LANG=C.UTF-8 LANGUAGE=C.UTF-8 echo "--- bundle install" - bundle config --local path vendor/bundle bundle install --jobs=7 --retry=3 diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 5a69b50..6535e4f 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -43,6 +43,14 @@ steps: docker: image: ruby:2.7-buster +- label: run-lint-and-specs-ruby-3.0 + command: + - .expeditor/run_linux_tests.sh rake + expeditor: + executor: + docker: + image: ruby:3.0-buster + - label: run-specs-windows command: - bundle config --local path vendor/bundle @@ -2,10 +2,8 @@ source "https://rubygems.org" gemspec name: "mixlib-shellout" -gem "parallel", "< 1.20" # pin until we drop ruby < 2.4 - group :test do - gem "chefstyle", "1.5.1" + gem "chefstyle", "1.6.2" gem "rake" gem "rspec", "~> 3.0" end @@ -13,6 +11,10 @@ end group :debug do gem "pry" gem "pry-byebug" - gem "pry-stack_explorer", "~> 0.4.0" # pin until we drop ruby < 2.6 gem "rb-readline" end + +if Gem.ruby_version < Gem::Version.new("2.6") + # 16.7.23 required ruby 2.6+ + gem "chef-utils", "< 16.7.23" # TODO: remove when we drop ruby 2.4/2.5 +end |