diff options
author | Tim Smith <tsmith@chef.io> | 2018-08-24 13:35:58 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-24 13:35:58 -0700 |
commit | f6f450609ebfbe819856d494bff6fdae92a01d00 (patch) | |
tree | df3c3dc8986fe8c326179f42f38577ecfcff4620 | |
parent | d61b447e3e2090fda56e3aa2231c5210d24cf440 (diff) | |
parent | 97d636a3f2c67fcf3e59f4d356e0d9d787e007c0 (diff) | |
download | chef-f6f450609ebfbe819856d494bff6fdae92a01d00.tar.gz |
Merge pull request #7585 from chef/instructions
Update some build / updating instructions for development
-rw-r--r-- | README.md | 3 | ||||
-rw-r--r-- | Rakefile | 2 | ||||
-rw-r--r-- | omnibus_overrides.rb | 3 |
3 files changed, 5 insertions, 3 deletions
@@ -66,7 +66,6 @@ Once you have your development environment configured you can clone the Chef rep git clone https://github.com/chef/chef.git cd chef bundle install -bundle exec rake gem bundle exec rake install ``` @@ -184,7 +183,7 @@ If there is a critical fix you believe should be backported from master to a sta 2. Cherry Pick the SHA with the fix: `git cherry-pick SHA` 3. Address any conflicts (if necessary) 5. Push the new branch to your origin: `git push origin` -5. Open a PR for your backport +5. Open a PR for your backport 1. The PR title should be `Backport: ORIGINAL_PR_TEXT` 2. The description should link to the original PR and include a description of why it needs to be backported @@ -23,7 +23,7 @@ require_relative "tasks/cbgb" require_relative "tasks/dependencies" require_relative "tasks/announce" -# hack the chef-config install to runon before the traditional install task +# hack the chef-config install to run before the traditional install task task :super_install do chef_config_path = ::File.join(::File.dirname(__FILE__), "chef-config") Dir.chdir(chef_config_path) diff --git a/omnibus_overrides.rb b/omnibus_overrides.rb index 865aaa14e8..5a2596d3ae 100644 --- a/omnibus_overrides.rb +++ b/omnibus_overrides.rb @@ -1,6 +1,9 @@ # THIS IS NOW HAND MANAGED, JUST EDIT THE THING # .travis.yml and appveyor.yml consume this, # try to keep it machine-parsable. +# +# NOTE: You MUST update omnibus-software when adding new versions of +# software here: bundle exec rake dependencies:update_omnibus_gemfile_lock override :rubygems, version: "2.7.6" override :bundler, version: "1.16.1" override "nokogiri", version: "1.8.2" |