Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

just for testing do not merge #115

Draft
wants to merge 8 commits into
base: main
Choose a base branch
from
Draft

just for testing do not merge #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7f5e8ae
just testing nothing serioys
muthuja Mar 21, 2024
6a9af17
change condition
muthuja Mar 21, 2024
44eabce
change condition
muthuja Mar 21, 2024
46fb0df
test this code
muthuja Mar 25, 2024
489f5bc
add chef-utils gem in gemfile
muthuja Mar 25, 2024
cd7b026
changing gemfile
muthuja Mar 25, 2024
c2bd14d
change flag settings
muthuja Mar 25, 2024
7d51a93
update chef-utils gem version
muthuja Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .expeditor/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion omnibus.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
# ------------------------------
Expand Down
15 changes: 14 additions & 1 deletion omnibus_overrides.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down