diff options
| author | tpowell-progress <104777878+tpowell-progress@users.noreply.github.com> | 2022-09-19 12:38:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-19 12:38:20 -0400 |
| commit | 27a79a174d548ac68614e66e834caaabe6c96e5f (patch) | |
| tree | 74ba7579ef39e89862a6635339a1410f557ed291 | |
| parent | 9b2e44c823737332ce646d1cb1b43d7d1de28486 (diff) | |
| download | chef-27a79a174d548ac68614e66e834caaabe6c96e5f.tar.gz | |
Restore original Gemfile omnibus-software spec (#13193)
Restore original Gemfile omnibus-software spec
with branch override for environmental variable
* Force omnibus-software sha hash to latest version
Signed-off-by: Thomas Powell <powell@progress.com>
| -rw-r--r-- | omnibus/Gemfile | 4 | ||||
| -rw-r--r-- | omnibus/Gemfile.lock | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/omnibus/Gemfile b/omnibus/Gemfile index 77f27b82ab..a8d16ac939 100644 --- a/omnibus/Gemfile +++ b/omnibus/Gemfile @@ -2,9 +2,7 @@ source "https://rubygems.org" gem "omnibus", github: ENV.fetch("OMNIBUS_GITHUB_REPO", "chef/omnibus"), branch: ENV.fetch("OMNIBUS_GITHUB_BRANCH", "main") -# FIXME temporarily forcing builds through jfm/ucrt_update brance for omnibus-software -# gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_BRANCH", "main") -gem "omnibus-software", github: ENV.fetch("OMNIBUS_SOFTWARE_GITHUB_REPO", "chef/omnibus-software"), branch: "jfm/ucrt_update" +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/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 0edc35475a..e4102e9e25 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,7 +1,7 @@ GIT remote: https://github.com/chef/omnibus-software.git - revision: 8b1efa78a0aad9574512253c7082a83fe4070819 - branch: jfm/ucrt_update + revision: fc901c6446e6354058133b89a29a6ef8e2995b3d + branch: main specs: omnibus-software (4.0.0) omnibus (>= 9.0.0) |