From 7f5e8ae29f1589d6842b5645fab5f44bcc75b3dc Mon Sep 17 00:00:00 2001 From: muthuja Date: Thu, 21 Mar 2024 13:41:02 +0530 Subject: [PATCH 1/8] just testing nothing serioys Signed-off-by: muthuja --- omnibus_overrides.rb | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 5357674..d9dc5fe 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -18,7 +18,20 @@ override "makedepend", version: "1.0.5" override "ncurses", version: "6.3" override "nokogiri", version: "1.13.6" -override "openssl", version: "3.0.9" + +require 'rbconfig' +def windows_2012_or_2012r2? + os = RbConfig::CONFIG['target_os'] + os.downcase.include?('windows') && (os.downcase.include?('2012') || os.downcase.include?('2012r2')) +end +def determine_openssl_version + if windows_2012_or_2012r2? + "1.0.2zi" + else + "3.0.9" + end +end +override "openssl", version: determine_openssl_version override "pkg-config-lite", version: "0.28-1" override :ruby, version: aix? ? "3.0.3" : "3.1.2" override "ruby-windows-devkit-bash", version: "3.1.23-4-msys-1.0.18" From 6a9af17e3def118bdc302b52adbcebff94c46585 Mon Sep 17 00:00:00 2001 From: muthuja Date: Thu, 21 Mar 2024 15:39:43 +0530 Subject: [PATCH 2/8] change condition Signed-off-by: muthuja --- omnibus_overrides.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index d9dc5fe..4f15a6b 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -19,10 +19,9 @@ override "ncurses", version: "6.3" override "nokogiri", version: "1.13.6" -require 'rbconfig' +require 'rubygems/platform' def windows_2012_or_2012r2? - os = RbConfig::CONFIG['target_os'] - os.downcase.include?('windows') && (os.downcase.include?('2012') || os.downcase.include?('2012r2')) + Gem.platforms.any? { |platform| platform.os == 'mingw32' && (platform.version.start_with?('6.2') || platform.version.start_with?('6.3')) } end def determine_openssl_version if windows_2012_or_2012r2? From 44eabce86155ebe613aabfae68403ea72fc4417d Mon Sep 17 00:00:00 2001 From: muthuja Date: Thu, 21 Mar 2024 16:01:51 +0530 Subject: [PATCH 3/8] change condition Signed-off-by: muthuja --- omnibus_overrides.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 4f15a6b..d9dc5fe 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -19,9 +19,10 @@ override "ncurses", version: "6.3" override "nokogiri", version: "1.13.6" -require 'rubygems/platform' +require 'rbconfig' def windows_2012_or_2012r2? - Gem.platforms.any? { |platform| platform.os == 'mingw32' && (platform.version.start_with?('6.2') || platform.version.start_with?('6.3')) } + os = RbConfig::CONFIG['target_os'] + os.downcase.include?('windows') && (os.downcase.include?('2012') || os.downcase.include?('2012r2')) end def determine_openssl_version if windows_2012_or_2012r2? From 46fb0df7029e2a31b20d8ebd0937e4de7bc171af Mon Sep 17 00:00:00 2001 From: muthuja Date: Mon, 25 Mar 2024 13:18:46 +0530 Subject: [PATCH 4/8] test this code Signed-off-by: muthuja --- omnibus_overrides.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index d9dc5fe..38b0a36 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -20,12 +20,12 @@ override "nokogiri", version: "1.13.6" require 'rbconfig' -def windows_2012_or_2012r2? +def windows_2012r2? os = RbConfig::CONFIG['target_os'] os.downcase.include?('windows') && (os.downcase.include?('2012') || os.downcase.include?('2012r2')) end def determine_openssl_version - if windows_2012_or_2012r2? + if windows_2012r2? "1.0.2zi" else "3.0.9" From 489f5bc787a109031e2c4e0379fd4e2bdd0b2ec6 Mon Sep 17 00:00:00 2001 From: muthuja Date: Mon, 25 Mar 2024 18:03:38 +0530 Subject: [PATCH 5/8] add chef-utils gem in gemfile Signed-off-by: muthuja --- Gemfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Gemfile b/Gemfile index 48311fd..df43af4 100644 --- a/Gemfile +++ b/Gemfile @@ -2,6 +2,8 @@ source "https://rubygems.org" gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main") +gem "chef-utils" ,github: ENV.fetch("CHEF-UTILS_GITHUB_REPO", "chef/testopenssl/muthuja"), branch:ENV.fetch("CHEF-UTILS_GITHUB_REPO", "testopenssl/muthuja") + gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") gem "artifactory" From cd7b026da8fd075e33b1f88b4ff5b183cb91a726 Mon Sep 17 00:00:00 2001 From: muthuja Date: Mon, 25 Mar 2024 19:36:07 +0530 Subject: [PATCH 6/8] changing gemfile Signed-off-by: muthuja --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index df43af4..a195245 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main") -gem "chef-utils" ,github: ENV.fetch("CHEF-UTILS_GITHUB_REPO", "chef/testopenssl/muthuja"), branch:ENV.fetch("CHEF-UTILS_GITHUB_REPO", "testopenssl/muthuja") +gem "chef-utils", git: "https://github.com/chef/chef.git", branch: "testopenssl/muthuja" gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") From c2bd14dc3625ff33251ab2e6961d31c2a6efea95 Mon Sep 17 00:00:00 2001 From: muthuja Date: Mon, 25 Mar 2024 21:30:30 +0530 Subject: [PATCH 7/8] change flag settings Signed-off-by: muthuja --- .expeditor/config.yml | 2 +- omnibus.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 879e042..7b64334 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -23,7 +23,7 @@ pipelines: env: - ADHOC: true - IGNORE_CACHE: true - - OMNIBUS_USE_INTERNAL_SOURCES: true + - OMNIBUS_USE_INTERNAL_SOURCES: false - omnibus/adhoc-canary: canary: true definition: .expeditor/adhoc-canary.omnibus.yml diff --git a/omnibus.rb b/omnibus.rb index 1d20763..0cbd9b0 100644 --- a/omnibus.rb +++ b/omnibus.rb @@ -32,7 +32,7 @@ windows_arch env_omnibus_windows_arch use_git_caching true -use_internal_sources ENV.fetch("OMNIBUS_USE_INTERNAL_SOURCES", true) +use_internal_sources ENV.fetch("OMNIBUS_USE_INTERNAL_SOURCES", false) # Enable S3 asset caching # ------------------------------ From 7d51a93268e1b73a09f678fe0d029bea853c28b5 Mon Sep 17 00:00:00 2001 From: muthuja Date: Mon, 25 Mar 2024 21:41:57 +0530 Subject: [PATCH 8/8] update chef-utils gem version Signed-off-by: muthuja --- Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5dec326..2ca6d52 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -73,7 +73,7 @@ GEM aws-sdk-s3 (~> 1.91) aws-sdk-secretsmanager (~> 1.46) chef-config (= 18.1.0) - chef-utils (= 18.1.0) + chef-utils (= 18.4.12) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -108,7 +108,7 @@ GEM aws-sdk-secretsmanager (~> 1.46) chef-config (= 18.1.0) chef-powershell (~> 1.0.12) - chef-utils (= 18.1.0) + chef-utils (= 18.4.12) chef-vault chef-zero (>= 14.0.11) corefoundation (~> 0.3.4) @@ -151,7 +151,7 @@ GEM chef-cleanroom (1.0.5) chef-config (18.1.0) addressable - chef-utils (= 18.1.0) + chef-utils (= 18.4.12) fuzzyurl mixlib-config (>= 2.2.12, < 4.0) mixlib-shellout (>= 2.0, < 4.0) @@ -162,7 +162,7 @@ GEM chef-telemetry (1.1.1) chef-config concurrent-ruby (~> 1.0) - chef-utils (18.1.0) + chef-utils (18.4.12) concurrent-ruby chef-vault (4.1.10) chef-zero (15.0.11)