summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaymala Sinha <jsinha@chef.io>2019-09-09 12:46:44 -0400
committerJaymala Sinha <jsinha@chef.io>2019-09-09 12:46:44 -0400
commit8e389f6972b068f648044d3050b6295121eba175 (patch)
tree20e725d1b2c2efb81cc44f040d1a2b07d25f2b3c
parenta5854d7ae6100a4f4a125d15dbef8fa69ca1cfad (diff)
downloadchef-8e389f6972b068f648044d3050b6295121eba175.tar.gz
Test AIX ruby bug 14834 patch
Signed-off-by: Jaymala Sinha <jsinha@chef.io>
-rw-r--r--omnibus/Gemfile2
-rw-r--r--omnibus/Gemfile.lock4
-rw-r--r--omnibus_overrides.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile
index 6fca425e62..b02f3df80f 100644
--- a/omnibus/Gemfile
+++ b/omnibus/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gem "omnibus", git: "https://github.com/chef/omnibus", branch: "master"
-gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "master"
+gem "omnibus-software", git: "https://github.com/chef/omnibus-software", branch: "jsinha/ruby_aix"
gem "artifactory"
gem "pedump"
diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock
index 09d7e4f6f6..9bfdbd2499 100644
--- a/omnibus/Gemfile.lock
+++ b/omnibus/Gemfile.lock
@@ -18,8 +18,8 @@ GIT
GIT
remote: https://github.com/chef/omnibus-software
- revision: b851a32e09a384cad768a6d44df267ffe920cfc2
- branch: master
+ revision: 5e8b0776790221e9394d124dac4036b57387d61c
+ branch: jsinha/ruby_aix
specs:
omnibus-software (4.0.0)
chef-sugar (>= 3.4.0)
diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb
index 1f33f9be1f..69d4c91e3b 100644
--- a/omnibus_overrides.rb
+++ b/omnibus_overrides.rb
@@ -19,7 +19,7 @@ override "ncurses", version: "5.9"
override "nokogiri", version: "1.10.2"
override "openssl", version: "1.0.2s"
override "pkg-config-lite", version: "0.28-1"
-override "ruby", version: "2.6.3"
+override "ruby", version: "2.6.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"