Ruby-3.0 builds

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

6 files changed, 11 insertions, 13 deletions

diff --git a/Gemfile b/Gemfile
index 3369222d57..7e77163bf7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -33,7 +33,8 @@ end
 
 group(:omnibus_package, :pry) do
   gem "pry"
-  gem "pry-byebug"
+  # byebug does not install on freebsd on ruby 3.0
+  #gem "pry-byebug"
   gem "pry-stack_explorer"
 end
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 097608da52..d4fc7dff71 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,7 +156,6 @@ GEM
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     builder (3.2.4)
-    byebug (11.1.3)
     chef-telemetry (1.0.29)
       chef-config
       concurrent-ruby (~> 1.0)
@@ -284,12 +283,9 @@ GEM
       tty-color (~> 0.5)
     plist (3.6.0)
     proxifier (1.0.3)
-    pry (0.13.1)
+    pry (0.14.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.9.0)
-      byebug (~> 11.0)
-      pry (~> 0.13.0)
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
@@ -443,7 +439,6 @@ DEPENDENCIES
   inspec-core-bin (~> 4.24)
   ohai!
   pry
-  pry-byebug
   pry-stack_explorer
   rake
   rb-readline
@@ -453,4 +448,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.1.4
+   2.2.3
diff --git a/omnibus/.tool-versions b/omnibus/.tool-versions
new file mode 100644
index 0000000000..9eb38ed717
--- /dev/null
+++ b/omnibus/.tool-versions
@@ -0,0 +1 @@
+ruby 2.7.2
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index df94943a3d..232d6b6551 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -21,4 +21,4 @@ group :development do
   gem "test-kitchen", ">= 1.23"
   gem "kitchen-vagrant", ">= 1.3.1"
   gem "winrm-fs", "~> 1.0"
-end
\ No newline at end of file
+end
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index a21791a82a..3276ff0491 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,7 +18,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/omnibus-software
-  revision: 56f632109747b0db45ecf703f354bb68d89aba4d
+  revision: 0dcaeb1940283bcb98c00dcfe9bb2821726ffa0a
   branch: master
   specs:
     omnibus-software (4.0.0)
@@ -32,7 +32,7 @@ GEM
     artifactory (3.0.15)
     awesome_print (1.9.2)
     aws-eventstream (1.1.1)
-    aws-partitions (1.441.0)
+    aws-partitions (1.442.0)
     aws-sdk-core (3.113.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
@@ -465,4 +465,4 @@ DEPENDENCIES
   winrm-fs (~> 1.0)
 
 BUNDLED WITH
-   2.1.4
+   2.2.15
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index d20d702d73..32c2cc6e69 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -16,7 +16,8 @@ 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.2"
+override "bundler", version: "2.2.15"
+override "ruby", version: "3.0.1"
 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"