summaryrefslogtreecommitdiff
path: root/.expeditor
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-11-08 14:06:33 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2019-11-08 14:06:33 -0800
commit8a7e29d52882c39d0c903eef83bd3472e4f334af (patch)
treea25a7b76416e07ebdb54e569fb0006079cf012db /.expeditor
parentc31625406530b560fab02b11fa2447955ed2faef (diff)
downloadchef-8a7e29d52882c39d0c903eef83bd3472e4f334af.tar.gz
Add chef-utils gem with various recipe DSL helpers
This is the implementation of [RFC-087](https://github.com/chef-boneyard/chef-rfc/blob/master/rfc087-distro-sugar-helpers.md) although some of the specifics have been iterated on and changed. The documentation will be in the [README.md](https://github.com/chef/chef/tree/master/chef-utils/README.md) once this is merged. While this PR mostly moves chef-sugar utilities into core-chef via this chef-utils gem, the scope of the chef-utils gem should be considered larger than just that. As an example this PR moves the Mash class into this gem for reuse in ohai as well. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to '.expeditor')
-rw-r--r--.expeditor/config.yml1
-rwxr-xr-x.expeditor/update_version.sh3
2 files changed, 3 insertions, 1 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 9d3e5b85b2..d484a18177 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -18,6 +18,7 @@ rubygems:
- chef
- chef-config
- chef-bin
+ - chef-utils
docker_images:
- chef
diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh
index 85f7340811..b362157d4b 100755
--- a/.expeditor/update_version.sh
+++ b/.expeditor/update_version.sh
@@ -13,10 +13,11 @@ set -evx
sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-config/lib/chef-config/version.rb
sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-bin/lib/chef-bin/version.rb
+sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" chef-utils/lib/chef-utils/version.rb
sed -i -r "s/VersionString\.new\(\".+\"\)/VersionString.new(\"$(cat VERSION)\")/" lib/chef/version.rb
# Update the version inside Gemfile.lock
-bundle update chef chef-config --jobs=7 --conservative
+bundle update chef chef-config chef-utils --jobs=7 --conservative
# Once Expeditor finishes executing this script, it will commit the changes and push
# the commit as a new tag corresponding to the value in the VERSION file.