From f685537c074ca87246ef7163ce97cfdd45c714e9 Mon Sep 17 00:00:00 2001 From: Thomas Powell Date: Tue, 5 Mar 2024 20:26:00 -0500 Subject: [PATCH 1/4] Bump minimum to 2.7 Signed-off-by: Thomas Powell --- .expeditor/verify.pipeline.yml | 16 ---------------- mixlib-log.gemspec | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 26c145a..0dd76e4 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -8,22 +8,6 @@ expeditor: steps: -- label: run-lint-and-specs-ruby-2.5 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:2.5 - -- label: run-lint-and-specs-ruby-2.6 - command: - - .expeditor/run_linux_tests.sh rake - expeditor: - executor: - docker: - image: ruby:2.6 - - label: run-lint-and-specs-ruby-2.7 command: - .expeditor/run_linux_tests.sh rake diff --git a/mixlib-log.gemspec b/mixlib-log.gemspec index 6e45be1..18f4f87 100644 --- a/mixlib-log.gemspec +++ b/mixlib-log.gemspec @@ -11,5 +11,5 @@ Gem::Specification.new do |gem| gem.authors = ["Chef Software, Inc."] gem.files = %w{LICENSE} + Dir.glob("lib/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } gem.require_paths = ["lib"] - gem.required_ruby_version = ">= 2.5" + gem.required_ruby_version = ">= 2.7" end From a40cd4c53d06d8b5199bfd45961a7195c362a33b Mon Sep 17 00:00:00 2001 From: Thomas Powell Date: Tue, 5 Mar 2024 20:48:52 -0500 Subject: [PATCH 2/4] Unbound cucumber, etc, for 2.4 retirement Signed-off-by: Thomas Powell --- Gemfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2a4a911..ae30a30 100755 --- a/Gemfile +++ b/Gemfile @@ -4,12 +4,12 @@ source "https://rubygems.org" gemspec group :test do - gem "activesupport", "< 6" # this dep can be removed when we drop Ruby 2.4 support + gem "activesupport" gem "chefstyle" - gem "cucumber", "< 5" # remove the version pin when we drop Ruby 2.4 support + gem "cucumber" gem "rake" gem "rspec", "~> 3.7" - gem "rubocop-ast", "= 1.4.1" # Drop this dependency/version when we remove ruby-2.4 support + gem "rubocop-ast" end group :debug do From 1ff126255ad029c9f38f17d806fc1d2ebbbcc6f9 Mon Sep 17 00:00:00 2001 From: Thomas Powell Date: Tue, 5 Mar 2024 21:01:08 -0500 Subject: [PATCH 3/4] Force cucumber version because artifactory? Signed-off-by: Thomas Powell --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index ae30a30..a472f4c 100755 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gemspec group :test do gem "activesupport" gem "chefstyle" - gem "cucumber" + gem "cucumber", "~> 4.0" gem "rake" gem "rspec", "~> 3.7" gem "rubocop-ast" From 8be4b2d0dcf7cf1e3cedf323806f0bca48b1474a Mon Sep 17 00:00:00 2001 From: Thomas Powell Date: Tue, 5 Mar 2024 21:10:10 -0500 Subject: [PATCH 4/4] Fix cucumber requirement Signed-off-by: Thomas Powell --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index a472f4c..8f4e113 100755 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gemspec group :test do gem "activesupport" gem "chefstyle" - gem "cucumber", "~> 4.0" + gem "cucumber", "~> 9.1.0" gem "rake" gem "rspec", "~> 3.7" gem "rubocop-ast"