summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2021-08-30 13:47:02 -0500
committerGitHub <noreply@github.com>2021-08-30 13:47:02 -0500
commit16c4ff40b3d9573ba8761f9061839c7dc58e2aa4 (patch)
tree318eeb0cbc8ebee8f47b1ba7745a9c9c0761eee6
parent0e8a2ec6a234a5ff3e2b92d00511b61fce222e7e (diff)
parent036d501c22dbcd5f0b9c3656cf9a97cdf14cb1da (diff)
downloadmixlib-cli-16c4ff40b3d9573ba8761f9061839c7dc58e2aa4.tar.gz
Merge pull request #83 from chef/bundler_deprecated_warning
Replace deprecated --without flag with bundle config
-rw-r--r--.expeditor/verify.pipeline.yml3
-rw-r--r--Gemfile1
2 files changed, 3 insertions, 1 deletions
diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml
index 855a197..d103ee1 100644
--- a/.expeditor/verify.pipeline.yml
+++ b/.expeditor/verify.pipeline.yml
@@ -39,7 +39,8 @@ steps:
- label: run-specs-windows
command:
- - bundle install --jobs=7 --retry=3 --without docs debug
+ - bundle config set --local without docs debug
+ - bundle install --jobs=7 --retry=3
- bundle exec rake
expeditor:
executor:
diff --git a/Gemfile b/Gemfile
index 222ad82..f071fe5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,6 +12,7 @@ group :test do
gem "chefstyle"
gem "rake"
gem "rspec", "~> 3.0"
+ gem "rubocop-ast", "~> 1.4.1" # Drop this dependency/version when we remove ruby-2.4 support
end
group :debug do