diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-03-06 10:33:36 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-03-06 10:33:36 -0800 |
| commit | a4eaa87775d89c835295ac1b7c7159a3ff2cffc9 (patch) | |
| tree | e5bd3957eb816a338cfa9afd44a07bd76b2b6c42 | |
| parent | a7d56100275045ad44e57386aad86e463788ee85 (diff) | |
| download | chef-revert-6773-revert-6770-tm/ruby_25.tar.gz | |
ruby-2.5 changeschef-revert-6773-revert-6770-tm/ruby_25
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 4 | ||||
| -rw-r--r-- | spec/unit/win32/security_spec.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/appveyor.yml b/appveyor.yml index dde3bb947e..bba2251da9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ cache: environment: matrix: - - ruby_version: "24-x64" + - ruby_version: "25-x64" clone_folder: c:\projects\chef clone_depth: 1 diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 8da7dc9940..91ddd61863 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -3,7 +3,7 @@ # try to keep it machine-parsable. override :rubygems, version: "2.6.14" override :bundler, version: "1.15.4" -override "nokogiri", version: "1.8.1" +override "nokogiri", version: "1.8.2" override "libffi", version: "3.2.1" override "libiconv", version: "1.15" override "liblzma", version: "5.2.3" @@ -14,7 +14,7 @@ override "libyaml", version: "0.1.7" override "makedepend", version: "1.0.5" override "ncurses", version: "5.9" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.4.3" +override "ruby", version: "2.5.0" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" override "util-macros", version: "1.19.0" override "xproto", version: "7.0.28" diff --git a/spec/unit/win32/security_spec.rb b/spec/unit/win32/security_spec.rb index 6e4441a482..6bed029eaa 100644 --- a/spec/unit/win32/security_spec.rb +++ b/spec/unit/win32/security_spec.rb @@ -59,7 +59,7 @@ describe "Chef::Win32::Security", :windows_only do expect(Chef::ReservedNames::Win32::Security).to receive(:SetNamedSecurityInfoW).and_return( Chef::ReservedNames::Win32::API::Error::ERROR_USER_NOT_FOUND ) - expect { Chef::ReservedNames::Win32::Security.set_named_security_info "/temp_path", :SE_FILE_OBJECT, {} }.to raise_error Chef::Exceptions::Chef::Exceptions::UserIDNotFound + expect { Chef::ReservedNames::Win32::Security.set_named_security_info "/temp_path", :SE_FILE_OBJECT, {} }.to raise_error Chef::Exceptions::UserIDNotFound end end end |