diff options
| author | Tim Smith <tsmith@chef.io> | 2018-08-24 11:56:34 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-08-24 11:56:34 -0700 |
| commit | 97d636a3f2c67fcf3e59f4d356e0d9d787e007c0 (patch) | |
| tree | f1092d6e1fc89fdef4ed91da1e9dd046ec65c079 | |
| parent | a749e76cad7b89ae21ac09f03ea17272ad2ab6dd (diff) | |
| download | chef-97d636a3f2c67fcf3e59f4d356e0d9d787e007c0.tar.gz | |
Update some build / updating instructions for developmentinstructions
Update the readme with the correct rake tasks to build chef
Fix a typo in the rake comments
Add a comment we have in DK to remind folks that they need to update the deps after changing the overrides.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -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" |