diff options
| -rw-r--r-- | .github/workflows/kitchen.yml | 4 | ||||
| -rw-r--r-- | Gemfile | 4 | ||||
| -rw-r--r-- | Gemfile.lock | 32 | ||||
| -rw-r--r-- | chef-universal-mingw-ucrt.gemspec | 12 | ||||
| -rw-r--r-- | chef.gemspec | 4 | ||||
| -rw-r--r-- | habitat/plan.ps1 | 2 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 25 |
7 files changed, 43 insertions, 40 deletions
diff --git a/.github/workflows/kitchen.yml b/.github/workflows/kitchen.yml index acf2700432..14db5f13ae 100644 --- a/.github/workflows/kitchen.yml +++ b/.github/workflows/kitchen.yml @@ -145,7 +145,7 @@ jobs: /opt/chef/bin/ohai -v /opt/chef/embedded/bin/rake --version echo "Updating Bundler" - gem install bundler:2.3.18 + bundle update --bundler echo "finished updating Bundler, now getting the version" /opt/chef/embedded/bin/bundle -v echo "finished getting the bundler version" @@ -160,7 +160,7 @@ jobs: source ~/.zshrc rbenv install 3.1.2 rbenv global 3.1.2 - gem install bundler:2.3.18 + bundle update --bundler echo "which bundler are we using?" which bundle echo "what version is that?" @@ -4,9 +4,11 @@ gem "chef", path: "." gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main" -# Nwed to file a bug with rest-client. In the meantime, we can use this until they accept the update. +# Need to file a bug with rest-client. In the meantime, we can use this until they accept the update. gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1" +gem "mixlib-archive", git: "https://github.com/chef/mixlib-archive", branch: "jfm/ucrt_update1" + gem "ffi", ">= 1.15.5" gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__)) gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__)) diff --git a/Gemfile.lock b/Gemfile.lock index f68bdf3526..8822d7e84a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,17 @@ GIT + remote: https://github.com/chef/mixlib-archive + revision: a24ab75591eb96917dfe8f45a4ceeeed80ad82f1 + branch: jfm/ucrt_update1 + specs: + mixlib-archive (1.2.0) + mixlib-log + +GIT remote: https://github.com/chef/ohai.git - revision: 89e6a08889f414efabc53a1c15c418baddc5cd2d + revision: 50899edffa0f29f1d5268dd9cb2f3b773681a1c7 branch: main specs: - ohai (18.0.20) + ohai (18.0.23) chef-config (>= 14.12, < 19) chef-utils (>= 16.0, < 19) ffi (~> 1.9) @@ -19,7 +27,7 @@ GIT GIT remote: https://github.com/chef/rest-client - revision: f3e30a17e5dd826b5f5dce82edcecc52464548e3 + revision: 93fc90399f02eed44f8d4b371681fdd0411d98b3 branch: jfm/ucrt_update1 specs: rest-client (2.1.0) @@ -62,7 +70,6 @@ PATH iniparse (~> 1.4) inspec-core (>= 5) license-acceptance (>= 1.0.5, < 3) - mixlib-archive (>= 0.4, < 2.0) mixlib-authentication (>= 2.1, < 4) mixlib-cli (>= 2.1.1, < 3.0) mixlib-log (>= 2.0.3, < 4.0) @@ -106,8 +113,8 @@ PATH GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) appbundler (0.13.4) mixlib-cli (>= 1.4, < 3.0) mixlib-shellout (>= 2.0, < 4.0) @@ -246,8 +253,6 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - mixlib-archive (1.1.7) - mixlib-log mixlib-authentication (3.0.10) mixlib-cli (2.1.8) mixlib-config (3.0.27) @@ -284,13 +289,13 @@ GEM pry (0.13.0) coderay (~> 1.1) method_source (~> 1.0) - pry-byebug (3.9.0) + pry-byebug (3.10.1) byebug (~> 11.0) - pry (~> 0.13.0) + pry (>= 0.13, < 0.15) pry-stack_explorer (0.6.1) binding_of_caller (~> 1.0) pry (~> 0.13) - public_suffix (4.0.7) + public_suffix (5.0.0) rack (2.2.4) rainbow (3.1.1) rake (13.0.6) @@ -382,7 +387,7 @@ GEM uuidtools (2.2.0) vault (0.17.0) aws-sigv4 - webmock (3.17.1) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -427,6 +432,7 @@ DEPENDENCIES fauxhai-ng ffi (>= 1.15.5) inspec-core-bin (>= 5) + mixlib-archive! ohai! proxifier! pry (= 0.13.0) @@ -440,4 +446,4 @@ DEPENDENCIES webmock BUNDLED WITH - 2.3.18 + 2.3.7 diff --git a/chef-universal-mingw-ucrt.gemspec b/chef-universal-mingw-ucrt.gemspec index 8e472ccdda..6d1a799f1f 100644 --- a/chef-universal-mingw-ucrt.gemspec +++ b/chef-universal-mingw-ucrt.gemspec @@ -1,23 +1,23 @@ gemspec = instance_eval(File.read(File.expand_path("chef.gemspec", __dir__))) -gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt}) +gemspec.platform = Gem::Platform.new(%w{mingw}) # gemspec.add_dependency "win32-api", "~> 1.10.0" # gemspec.add_dependency "win32-event", "~> 0.6.1" -# TODO: Relax this pin and make the necessary updaets. The issue originally -# leading to this pin has been fixed in 0.6.5. +# # TODO: Relax this pin and make the necessary updates. The issue originally +# # leading to this pin has been fixed in 0.6.5. # gemspec.add_dependency "win32-eventlog", "0.6.3" # gemspec.add_dependency "win32-mmap", "~> 0.4.1" # gemspec.add_dependency "win32-mutex", "~> 0.4.2" -# gemspec.add_dependency "win32-process", "~> 0.9" +# gemspec.add_dependency "win32-process", "~> 0.10" # gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0" # gemspec.add_dependency "wmi-lite", "~> 1.0" # gemspec.add_dependency "win32-taskscheduler", "~> 2.0" # gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out # gemspec.add_dependency "win32-certstore", "~> 0.6.15" # 0.5+ required for specifying user vs. system store -# gemspec.add_dependency "chef-powershell", "~> 1.0.12" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo. +gemspec.add_dependency "chef-powershell", "~> 1.0.12" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo. gemspec.extensions << "ext/win32-eventlog/Rakefile" gemspec.files += Dir.glob("{distro,ext}/**/*") -gemspec.required_ruby_version = ">= 3.1.2" +gemspec.required_ruby_version = ">= 3.1" gemspec diff --git a/chef.gemspec b/chef.gemspec index fa9d620938..844dc87ff1 100644 --- a/chef.gemspec +++ b/chef.gemspec @@ -28,7 +28,7 @@ Gem::Specification.new do |s| if RUBY_PLATFORM == "x64-mingw-ucrt" s.add_dependency "win32-mmap", "~> 0.4.1" s.add_dependency "win32-mutex", "~> 0.4.2" - s.add_dependency "chef-powershell", "~> 1.0.12" + # s.add_dependency "chef-powershell", "~> 1.0.12" s.add_dependency "win32-api", "~> 1.10.0" s.add_dependency "win32-service", ">= 2.1.5", "< 3.0" s.add_dependency "win32-event", "~> 0.6.1" @@ -52,7 +52,7 @@ Gem::Specification.new do |s| s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0" s.add_dependency "mixlib-authentication", ">= 2.1", "< 4" s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0" - s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" + # s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0" s.add_dependency "ohai", "~> 18.0" s.add_dependency "inspec-core", ">= 5" diff --git a/habitat/plan.ps1 b/habitat/plan.ps1 index 4b37b27e59..2c26fae8dc 100644 --- a/habitat/plan.ps1 +++ b/habitat/plan.ps1 @@ -71,7 +71,7 @@ function Invoke-Prepare { "@ $gem_file | Set-Content "$PWD\\gem.bat" $env:Path += ";c:\\Program Files\\Git\\bin" - gem install bundler:2.3.17 + bundle update --bundler Write-BuildLine " ** Configuring bundler for this build environment" bundle config --local without server docgen maintenance pry travis integration ci chefstyle if (-not $?) { throw "unable to configure bundler to restrict gems to be installed" } diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index fd8cff7059..ec527494e2 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/chef/omnibus.git - revision: 83d8428abde4cb289a161f736822ba02563a884c + revision: 5b41f817c386d598c57652f1e1340ea312ed487d branch: main specs: - omnibus (9.0.3) + omnibus (9.0.6) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-utils (>= 15.4) @@ -29,13 +29,13 @@ GIT GEM remote: https://rubygems.org/ specs: - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) artifactory (3.0.15) awesome_print (1.9.2) aws-eventstream (1.2.0) - aws-partitions (1.610.0) - aws-sdk-core (3.131.3) + aws-partitions (1.626.0) + aws-sdk-core (3.140.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -47,7 +47,7 @@ GEM aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) - aws-sdk-secretsmanager (1.64.0) + aws-sdk-secretsmanager (1.65.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sigv4 (1.5.1) @@ -174,7 +174,7 @@ GEM ffi (>= 1.15.0) diff-lcs (1.5.0) ed25519 (1.3.0) - erubi (1.10.0) + erubi (1.11.0) erubis (2.7.0) faraday (1.4.3) faraday-em_http (~> 1.0) @@ -276,11 +276,6 @@ GEM ffi-win32-extensions (~> 1.0.3) win32-process (~> 0.9) wmi-lite (~> 1.0) - mixlib-shellout (3.2.7-x64-mingw-ucrt) - chef-utils - ffi-win32-extensions (~> 1.0.3) - win32-process (~> 0.9) - wmi-lite (~> 1.0) mixlib-versioning (1.2.12) molinillo (0.8.0) multi_json (1.15.0) @@ -324,7 +319,7 @@ GEM pry (0.14.1) coderay (~> 1.1) method_source (~> 1.0) - public_suffix (4.0.7) + public_suffix (5.0.0) rack (2.2.4) rainbow (3.1.1) retryable (3.0.5) @@ -364,7 +359,7 @@ GEM strings-ansi (0.2.0) structured_warnings (0.4.0) syslog-logger (1.6.8) - test-kitchen (3.3.1) + test-kitchen (3.3.2) bcrypt_pbkdf (~> 1.0) chef-utils (>= 16.4.35) ed25519 (~> 1.2) |