From 13c81ddd0dc43419905bab156930d18302642997 Mon Sep 17 00:00:00 2001 From: jayashri garud Date: Fri, 3 Sep 2021 10:18:22 +0530 Subject: [PATCH 1/2] Replace deprecated --without flag with bundle config Signed-off-by: jayashri garud --- .expeditor/verify.pipeline.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index b0909a3..4918d45 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -1,7 +1,8 @@ steps: - label: run-lint-and-specs-ruby-2.5 command: - - bundle install --jobs=7 --retry=3 --without docs development + - bundle config set --local without docs development + - bundle install --jobs=7 --retry=3 - export USER="root" - bundle exec rake expeditor: @@ -12,7 +13,8 @@ steps: - label: run-lint-and-specs-ruby-2.6 command: - export USER="root" - - bundle install --jobs=7 --retry=3 --without docs development + - bundle config set --local without docs development + - bundle install --jobs=7 --retry=3 - bundle exec rake expeditor: executor: From ab49bf8607c673c870a548024c6e5e968fb04a99 Mon Sep 17 00:00:00 2001 From: jayashri garud Date: Fri, 3 Sep 2021 10:32:14 +0530 Subject: [PATCH 2/2] Pin chef-utils to 16.6.14 Signed-off-by: jayashri garud --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 64540a6..54e69ca 100644 --- a/Gemfile +++ b/Gemfile @@ -6,4 +6,5 @@ group :test do gem "chefstyle", "0.13.0" gem "minitest", "~> 5.5" gem "rake", ">= 10" + gem "chef-utils", "~> 16.6.14" end