diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2021-03-23 12:37:49 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2021-03-25 09:45:38 -0700 |
| commit | 4eebe43820e54fd079889d5f1771b01c6d568a2f (patch) | |
| tree | 054bede66218a793f16f77a0cca6f4d7f438c81f | |
| parent | f1a890e870d076a8cf0b4e16e415bcf4de3c8dfc (diff) | |
| download | chef-4eebe43820e54fd079889d5f1771b01c6d568a2f.tar.gz | |
WIP
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 7 | ||||
| -rw-r--r-- | omnibus/omnibus.rb | 2 | ||||
| -rw-r--r-- | omnibus_overrides.rb | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index df94943a3d..e34b4e1ab1 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", path: "../../omnibus-software" gem "artifactory" gem "pedump" @@ -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 41976b21a1..66f7b12462 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -18,8 +18,11 @@ GIT GIT remote: https://github.com/chef/omnibus-software - revision: f6aa2edd80c4b896738f843d9e613212c8510481 - branch: master + revision: 1769ef260837e73a3a865f1fa3e02ef2e0aa394c + specs: + +PATH + remote: ../../omnibus-software specs: omnibus-software (4.0.0) omnibus (>= 8.0.0) diff --git a/omnibus/omnibus.rb b/omnibus/omnibus.rb index 99817f7caf..31c4ac1e13 100644 --- a/omnibus/omnibus.rb +++ b/omnibus/omnibus.rb @@ -35,7 +35,7 @@ use_git_caching true # Enable S3 asset caching # ------------------------------ -use_s3_caching true +use_s3_caching false s3_access_key ENV["AWS_ACCESS_KEY_ID"] s3_secret_key ENV["AWS_SECRET_ACCESS_KEY"] s3_bucket "opscode-omnibus-cache" diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 3267966641..182dcdc83e 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -16,7 +16,7 @@ override "ncurses", version: "5.9" override "nokogiri", version: "1.11.0" override "openssl", version: mac_os_x? ? "1.1.1j" : "1.0.2y" override "pkg-config-lite", version: "0.28-1" -override "ruby", version: "2.7.2" +override "ruby", version: "3.0.0" 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" |