summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2021-07-23 12:41:16 -0700
committerTim Smith <tsmith@chef.io>2021-07-23 12:41:16 -0700
commit4f3130748a349ecc064377d64ea1c1319b001645 (patch)
tree3154fb1d4629fe6b87b17a162a8654a61cd280d4
parent4d3f0bbc748e568c8ca112d571032422990085c1 (diff)
downloadchef-4f3130748a349ecc064377d64ea1c1319b001645.tar.gz
Update Ruby to 2.7.4
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--omnibus/.gitignore1
-rw-r--r--omnibus/Gemfile.lock8
-rw-r--r--omnibus_overrides.rb2
3 files changed, 6 insertions, 5 deletions
diff --git a/omnibus/.gitignore b/omnibus/.gitignore
index 91d2b32b21..5afec22dae 100644
--- a/omnibus/.gitignore
+++ b/omnibus/.gitignore
@@ -12,3 +12,4 @@ build_timestamp
ldd.out
Berksfile.lock
Gemfile.local
+*.gem
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index b2741dba7b..394a814755 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/chef/omnibus-software.git
- revision: 07291b0f251745d229bf7bec541c748b0d946488
+ revision: a4f73e48a8d2e276fccda71dc99d217ee27a5464
branch: master
specs:
omnibus-software (4.0.0)
@@ -191,7 +191,7 @@ GEM
faraday-em_synchrony (1.0.0)
faraday-excon (1.1.0)
faraday-net_http (1.0.1)
- faraday-net_http_persistent (1.1.0)
+ faraday-net_http_persistent (1.2.0)
faraday_middleware (1.0.0)
faraday (~> 1.0)
ffi (1.15.3)
@@ -212,7 +212,7 @@ GEM
highline (2.0.3)
httpclient (2.8.3)
iniparse (1.5.0)
- inspec-core (4.37.30)
+ inspec-core (4.38.9)
addressable (~> 2.4)
chef-telemetry (~> 1.0, >= 1.0.8)
faraday (>= 0.9.0, < 1.5)
@@ -345,7 +345,7 @@ GEM
rspec-support (~> 3.10.0)
rspec-support (3.10.2)
ruby-progressbar (1.11.0)
- ruby2_keywords (0.0.4)
+ ruby2_keywords (0.0.5)
rubyntlm (0.6.3)
rubyzip (2.3.2)
sawyer (0.8.2)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 69f5520199..3ec48e6bbf 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -16,7 +16,7 @@ override "ncurses", version: "5.9"
override "nokogiri", version: "1.11.0"
override "openssl", version: mac_os_x? ? "1.1.1k" : "1.0.2y"
override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.7.3"
+override "ruby", version: "2.7.4"
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"