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/Gemfile b/Gemfile index 48311fd..a195245 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", 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") gem "artifactory" 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) 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 # ------------------------------ diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 5357674..38b0a36 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_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_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"