From d8cc4151d2b9a409b96582eb9bf043fbed104715 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 9 Sep 2025 14:08:11 +0530 Subject: [PATCH 1/7] Move syslog dependency from Gemfile to gemspec Signed-off-by: nikhil2611 --- Gemfile | 1 - chef-cli.gemspec | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 11d7d488..8537e4ef 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,6 @@ gemspec gem "logger", "< 1.6" # 1.6 causes errors with mixlib-log < 3.1.1 gem "chefspec" -gem "syslog" group :test do gem "rake" diff --git a/chef-cli.gemspec b/chef-cli.gemspec index b640dbcb..1d7277d7 100644 --- a/chef-cli.gemspec +++ b/chef-cli.gemspec @@ -51,4 +51,5 @@ Gem::Specification.new do |gem| gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3" gem.add_dependency "chef-licensing", "~> 1.0" + gem.add_dependency "syslog", "~> 0.3" end From dea2eff063b00922ab5785107ced8cbf841f4526 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Tue, 9 Sep 2025 23:41:04 +0530 Subject: [PATCH 2/7] added ruby version condition Signed-off-by: nikhil2611 --- chef-cli.gemspec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/chef-cli.gemspec b/chef-cli.gemspec index 1d7277d7..7d2b2f4f 100644 --- a/chef-cli.gemspec +++ b/chef-cli.gemspec @@ -51,5 +51,10 @@ Gem::Specification.new do |gem| gem.add_dependency "pastel", "~> 0.7" # used for policyfile differ gem.add_dependency "license-acceptance", ">= 1.0.11", "< 3" gem.add_dependency "chef-licensing", "~> 1.0" - gem.add_dependency "syslog", "~> 0.3" + + # This gem was removed from the Ruby standard library starting with version 3.4 + # See: https://stdgems.org/new-in/3.4 + if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.4") + gem.add_dependency "syslog", "~> 0.3" + end end From 54c430a78ae4f9e19ac40b9dc9c945ce60498847 Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Wed, 10 Sep 2025 12:40:17 +0530 Subject: [PATCH 3/7] Temp code to remove cache Signed-off-by: Ashique Saidalavi --- .expeditor/run_windows_tests.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index 63531efd..477a55ce 100755 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,4 +1,7 @@ $ErrorActionPreference="stop" +Write-Host "Manually clearing the chef-test-kitchen-enterprise cache" +Remove-Item -Recursive -Force "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2" +Write-Host "Cleaned the previous cache" Write-Host "--- bundle install" From a0a804563e8c7512c0842760ea64b826dd0f02a6 Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Wed, 10 Sep 2025 12:45:26 +0530 Subject: [PATCH 4/7] Fixed the remove command Signed-off-by: Ashique Saidalavi --- .expeditor/run_windows_tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index 477a55ce..a2200b13 100755 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,6 +1,6 @@ $ErrorActionPreference="stop" Write-Host "Manually clearing the chef-test-kitchen-enterprise cache" -Remove-Item -Recursive -Force "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2" +Remove-Item -Recurse -Force "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2" Write-Host "Cleaned the previous cache" Write-Host "--- bundle install" From 343af733b6d5a0d3e2fa0ee8fa250b9a833366b9 Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Wed, 10 Sep 2025 13:03:23 +0530 Subject: [PATCH 5/7] Removed the temp code Signed-off-by: Ashique Saidalavi --- .expeditor/run_windows_tests.ps1 | 3 --- 1 file changed, 3 deletions(-) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index a2200b13..63531efd 100755 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,7 +1,4 @@ $ErrorActionPreference="stop" -Write-Host "Manually clearing the chef-test-kitchen-enterprise cache" -Remove-Item -Recurse -Force "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2" -Write-Host "Cleaned the previous cache" Write-Host "--- bundle install" From 57be0c2745b72d78c13ad9fc393c1b140b0caf43 Mon Sep 17 00:00:00 2001 From: Ashique Saidalavi Date: Wed, 10 Sep 2025 14:00:01 +0530 Subject: [PATCH 6/7] Removing cache dir Signed-off-by: Ashique Saidalavi --- .expeditor/run_windows_tests.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index 63531efd..74cd60b1 100755 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,5 +1,13 @@ $ErrorActionPreference="stop" +Write-Host "Manually clearing the chef-test-kitchen-enterprise cache" +if (Test-Path "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2") { + Remove-Item -Recurse -Force "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2" + Write-Host "Cleaned the previous cache" +} else { + Write-Host "Cache directory does not exist" +} + Write-Host "--- bundle install" bundle config --local path vendor/bundle From b7c5dcd9e101dc0169fd95017cd0642b79cfc9e8 Mon Sep 17 00:00:00 2001 From: nikhil2611 Date: Wed, 10 Sep 2025 14:30:23 +0530 Subject: [PATCH 7/7] reverted back the cache fix code Signed-off-by: nikhil2611 --- .expeditor/run_windows_tests.ps1 | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.expeditor/run_windows_tests.ps1 b/.expeditor/run_windows_tests.ps1 index 74cd60b1..63531efd 100755 --- a/.expeditor/run_windows_tests.ps1 +++ b/.expeditor/run_windows_tests.ps1 @@ -1,13 +1,5 @@ $ErrorActionPreference="stop" -Write-Host "Manually clearing the chef-test-kitchen-enterprise cache" -if (Test-Path "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2") { - Remove-Item -Recurse -Force "C:/workdir/vendor/bundle/ruby/3.1.0/cache/bundler/git/chef-test-kitchen-enterprise-dba8545c33365a2bffe55f9cb935af5b46709af2" - Write-Host "Cleaned the previous cache" -} else { - Write-Host "Cache directory does not exist" -} - Write-Host "--- bundle install" bundle config --local path vendor/bundle