diff options
| author | John McCrae <john.mccrae@progress.com> | 2022-06-30 08:21:49 -0700 |
|---|---|---|
| committer | John McCrae <john.mccrae@progress.com> | 2022-07-11 08:47:59 -0700 |
| commit | 72a137f86efb37c405ef4601f257b96047a50e4a (patch) | |
| tree | a4632a7c516405cddbd5ab68e99fee0f0d42e3e3 | |
| parent | 09ee2ec32b9a6f98bc8392b1c2272113254b899f (diff) | |
| download | chef-72a137f86efb37c405ef4601f257b96047a50e4a.tar.gz | |
starting to integrate ruby 3.1 into the builds
Signed-off-by: John McCrae <john.mccrae@progress.com>
| -rw-r--r-- | Gemfile.lock | 17 | ||||
| -rw-r--r-- | chef-universal-mingw-ucrt.gemspec | 22 |
2 files changed, 29 insertions, 10 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 64c42b8477..af9d26843d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -32,13 +32,6 @@ GIT specs: proxifier (1.0.3) -GIT - remote: https://github.com/chef/ruby-shadow - revision: 3b8ea40b0e943b5de721d956741308ce805a5c3c - branch: lcg/ruby-3.0 - specs: - ruby-shadow (2.5.0) - PATH remote: . specs: @@ -228,6 +221,7 @@ GEM fauxhai-ng (9.3.0) net-ssh ffi (1.15.5) + ffi (1.15.5-x64-mingw-ucrt) ffi (1.15.5-x64-mingw32) ffi (1.15.5-x86-mingw32) ffi-libarchive (1.1.3) @@ -308,6 +302,11 @@ 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) multi_json (1.15.0) multipart-post (2.2.3) net-ftp (0.1.3) @@ -442,8 +441,6 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.8) - unf_ext (0.0.8-x64-mingw32) - unf_ext (0.0.8-x86-mingw32) unicode-display_width (2.2.0) unicode_utils (1.4.0) uuidtools (2.2.0) @@ -499,6 +496,7 @@ GEM PLATFORMS ruby + x64-mingw-ucrt x64-mingw32 x86-mingw32 @@ -522,7 +520,6 @@ DEPENDENCIES rake rb-readline rspec - ruby-shadow! webmock BUNDLED WITH diff --git a/chef-universal-mingw-ucrt.gemspec b/chef-universal-mingw-ucrt.gemspec new file mode 100644 index 0000000000..4b59ec5fc4 --- /dev/null +++ b/chef-universal-mingw-ucrt.gemspec @@ -0,0 +1,22 @@ +gemspec = eval(IO.read(File.expand_path("chef.gemspec", __dir__))) + +gemspec.platform = Gem::Platform.new(%w{x64-mingw-ucrt}) + +gemspec.add_dependency "win32-api", "~> 1.5.3" +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. +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-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.10" # 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.extensions << "ext/win32-eventlog/Rakefile" +gemspec.files += Dir.glob("{distro,ext}/**/*") + +gemspec |