From 706c3d9d568918fb8e90f40502621f2d4f7e690e Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 10 Jul 2024 17:01:54 +0530 Subject: [PATCH 01/11] added the ruby 3.3 pipeline and remove older ruby ones Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 470fb9a48..45de69650 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -11,29 +11,13 @@ expeditor: steps: -- label: run-specs-ruby-2.7 +- label: run-specs-ruby-3.3 command: - .expeditor/run_linux_tests.sh "rake spec" expeditor: executor: docker: - image: ruby:2.7 - -- label: run-specs-ruby-3.0 - command: - - .expeditor/run_linux_tests.sh "rake spec" - expeditor: - executor: - docker: - image: ruby:3.0 - -- label: run-specs-ruby-3.1 - command: - - .expeditor/run_linux_tests.sh "rake spec" - expeditor: - executor: - docker: - image: ruby:3.1 + image: ruby:3.3 - label: run-specs-ruby-2.7-windows From 13998a2131eea20e3bda1f6e79ba435750c4677e Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 12 Jul 2024 14:35:50 +0530 Subject: [PATCH 02/11] updated pipeline and gems Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 27 ++------------------------- chef-apply.gemspec | 4 ++-- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 45de69650..1bc03e8c1 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -19,30 +19,7 @@ steps: docker: image: ruby:3.3 - -- label: run-specs-ruby-2.7-windows - command: - - .expeditor/run_windows_tests.ps1 - expeditor: - executor: - docker: - host_os: windows - shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:2.7 - user: 'NT AUTHORITY\SYSTEM' - -- label: run-specs-ruby-3.0-windows - command: - - .expeditor/run_windows_tests.ps1 - expeditor: - executor: - docker: - host_os: windows - shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:3.0 - user: 'NT AUTHORITY\SYSTEM' - -- label: run-specs-ruby-3.1-windows +- label: run-specs-ruby-3.3-windows command: - .expeditor/run_windows_tests.ps1 expeditor: @@ -50,5 +27,5 @@ steps: docker: host_os: windows shell: ["powershell", "-Command"] - image: rubydistros/windows-2019:3.1 + image: rubydistros/windows-2019:3.3 user: 'NT AUTHORITY\SYSTEM' \ No newline at end of file diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 4f2621c09..0cbeb3a5c 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.description = "Ad-hoc management of individual nodes and devices." spec.homepage = "https://github.com/chef/chef-apply" spec.license = "Apache-2.0" - spec.required_ruby_version = ">= 2.7" + spec.required_ruby_version = ">= 3.1" spec.files = %w{Rakefile LICENSE warning.txt} + Dir.glob("Gemfile*") + # Includes Gemfile and locks @@ -49,7 +49,7 @@ Gem::Specification.new do |spec| spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI - spec.add_dependency "chef", ">= 16.0" # Needed to load cookbooks + spec.add_dependency "chef", ">= 18.0" # Needed to load cookbooks spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3" From cd93a9a2465321fa7d3613483b9abd39d9b9787b Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Fri, 12 Jul 2024 14:37:12 +0530 Subject: [PATCH 03/11] updated chef gems Signed-off-by: nikhil2611 --- chef-apply.gemspec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 0cbeb3a5c..b35fd01be 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -49,7 +49,11 @@ Gem::Specification.new do |spec| spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI - spec.add_dependency "chef", ">= 18.0" # Needed to load cookbooks + if RUBY_VERSION.match?(/3.3/) + spec.add_dependency "chef", "~> 18.0" + else + spec.add_dependency "chef", ">= 16.0" + end spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3" From 2c2b79d8ca048b136a856dd45730f4f74300a6af Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Sat, 13 Jul 2024 19:46:27 +0530 Subject: [PATCH 04/11] updated rspec version Signed-off-by: nikhil2611 --- Gemfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 28401af41..c7bb74e21 100644 --- a/Gemfile +++ b/Gemfile @@ -19,9 +19,9 @@ source "https://rubygems.org" gemspec group :development do - gem "chefstyle", "2.2.2" + gem "chefstyle", "2.2.3" gem "rake", ">= 10.1.0" - gem "rspec", "~> 3.0" + gem "rspec", "~> 3.1" gem "simplecov" end From 771c87e9c5da4ce36be550253bd0051de8a602bd Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Sun, 14 Jul 2024 15:21:54 +0530 Subject: [PATCH 05/11] updated rspec version Signed-off-by: nikhil2611 --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index c7bb74e21..31188c5c4 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gemspec group :development do gem "chefstyle", "2.2.3" gem "rake", ">= 10.1.0" - gem "rspec", "~> 3.1" + gem "rspec", "~> 3.12" gem "simplecov" end From c19395e98a07d64bf20f49a0442280a2ec18d743 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 18 Jul 2024 17:34:37 +0530 Subject: [PATCH 06/11] updated the timeout Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 1bc03e8c1..03512e2d2 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -7,7 +7,7 @@ expeditor: retry: automatic: limit: 1 - timeout_in_minutes: 30 + timeout_in_minutes: 60 steps: From a1af451464a8005049f00d7d5fd92c7007054ffb Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Thu, 18 Jul 2024 17:43:30 +0530 Subject: [PATCH 07/11] reverted back the timeout to 30 Signed-off-by: nikhil2611 --- .expeditor/verify.pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/verify.pipeline.yml b/.expeditor/verify.pipeline.yml index 03512e2d2..1bc03e8c1 100644 --- a/.expeditor/verify.pipeline.yml +++ b/.expeditor/verify.pipeline.yml @@ -7,7 +7,7 @@ expeditor: retry: automatic: limit: 1 - timeout_in_minutes: 60 + timeout_in_minutes: 30 steps: From 56dc73c2b737d7c93e82d33a5ae81a67a1491c45 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 22 Jul 2024 00:05:29 +0530 Subject: [PATCH 08/11] updated the pipeline to 3.3 Signed-off-by: nikhil2611 --- .github/workflows/lint.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 7e5b422cc..48fba284e 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -16,7 +16,7 @@ jobs: - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1 + ruby-version: 3.3 bundler-cache: true - uses: r7kamura/rubocop-problem-matchers-action@v1 # this shows the failures in the PR - run: bundle exec chefstyle @@ -37,10 +37,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Set up ruby 3.1 + - name: Set up ruby 3.3 uses: ruby/setup-ruby@v1 with: - ruby-version: 3.1 + ruby-version: 3.3 bundler-cache: true - name: run specs run: bundle exec rake spec --trace From 90f77e90fe2dff59dc3185911fc1c90179936b81 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Mon, 22 Jul 2024 12:53:47 +0530 Subject: [PATCH 09/11] updated the ruby to 3.3 in gemspec Signed-off-by: nikhil2611 --- chef-apply.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index b35fd01be..c6d230566 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -29,7 +29,7 @@ Gem::Specification.new do |spec| spec.description = "Ad-hoc management of individual nodes and devices." spec.homepage = "https://github.com/chef/chef-apply" spec.license = "Apache-2.0" - spec.required_ruby_version = ">= 3.1" + spec.required_ruby_version = ">= 3.3" spec.files = %w{Rakefile LICENSE warning.txt} + Dir.glob("Gemfile*") + # Includes Gemfile and locks From 5fb45487482f19d77c57c35500fdefe356e205d2 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 23 Jul 2024 17:10:40 +0530 Subject: [PATCH 10/11] updated ruby version condition Signed-off-by: nikhil2611 --- chef-apply.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index c6d230566..9cadded31 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -49,7 +49,7 @@ Gem::Specification.new do |spec| spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI - if RUBY_VERSION.match?(/3.3/) + if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1.0") spec.add_dependency "chef", "~> 18.0" else spec.add_dependency "chef", ">= 16.0" From 7f1a1ae33702979ff717e40e17278d17e2fa84ae Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 23 Jul 2024 17:34:37 +0530 Subject: [PATCH 11/11] updated ruby version condition Signed-off-by: nikhil2611 --- chef-apply.gemspec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/chef-apply.gemspec b/chef-apply.gemspec index 9cadded31..57ac6378b 100644 --- a/chef-apply.gemspec +++ b/chef-apply.gemspec @@ -49,11 +49,7 @@ Gem::Specification.new do |spec| spec.add_dependency "train-winrm" # winrm transports were pulled out into this plugin spec.add_dependency "pastel" # A color library spec.add_dependency "tty-spinner" # Pretty output for status updates in the CLI - if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.1.0") - spec.add_dependency "chef", "~> 18.0" - else - spec.add_dependency "chef", ">= 16.0" - end + spec.add_dependency "chef", "~> 18.0" spec.add_dependency "chef-cli", ">= 2.0.10 " # Policyfile spec.add_dependency "chef-telemetry", ">= 1.0.2" spec.add_dependency "license-acceptance", ">= 1.0.11", "< 3"