diff options
author | Thom May <thom@chef.io> | 2018-02-15 14:25:07 +0000 |
---|---|---|
committer | Thom May <thom@chef.io> | 2018-02-15 15:19:05 +0000 |
commit | 0ac00a8e04dcdf4298c68d92d047eb1c2cf04351 (patch) | |
tree | 60386774f921799651bc69626d2ba13a1c077334 | |
parent | fdd9db047ee8b7401b947c1e60d9b996bd4fc336 (diff) | |
download | chef-zero-0ac00a8e04dcdf4298c68d92d047eb1c2cf04351.tar.gz |
Use latest ruby and enable expeditor
Signed-off-by: Thom May <thom@chef.io>
-rw-r--r-- | .expeditor/config.yml | 35 | ||||
-rw-r--r-- | .expeditor/update_version.sh | 12 | ||||
-rw-r--r-- | .travis.yml | 16 | ||||
-rw-r--r-- | CHANGELOG.md | 13 | ||||
-rw-r--r-- | Gemfile | 6 | ||||
-rw-r--r-- | Rakefile | 13 |
6 files changed, 65 insertions, 30 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 0000000..a1d6d76 --- /dev/null +++ b/.expeditor/config.yml @@ -0,0 +1,35 @@ +--- +slack: + notify_channel: chef-notify + +github: + version_tag_format: "v{{version}}" + minor_bump_labels: + - "Version: Bump Minor" + +changelog: + rollup_header: Changes not yet released to rubygems.org + +rubygems: + - chef-zero + +merge_actions: + - built_in:bump_version: + ignore_labels: + - "Version: Skip Bump" + - "Expeditor: Skip All" + - bash:.expeditor/update_version.sh: + only_if: + - built_in:bump_version + - built_in:update_changelog: + ignore_labels: + - "Changelog: Skip Update" + - "Expeditor: Skip All" + - built_in:build_gem: + only_if: + - built_in:bump_version + +promote: + action: + - built_in:publish_rubygems + - built_in:rollover_changelog diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh new file mode 100644 index 0000000..2a32c6e --- /dev/null +++ b/.expeditor/update_version.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# +# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file. +# It then executes this file to update any other files/components with that new version. +# + +set -evx + +sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" lib/chef_zero/version.rb + +# Once Expeditor finshes executing this script, it will commit the changes and push +# the commit as a new tag corresponding to the value in the VERSION file. diff --git a/.travis.yml b/.travis.yml index ab474a3..23da645 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,11 +18,11 @@ script: matrix: include: - - rvm: 2.4.1 + - rvm: 2.5.0 env: PEDANT_KNIFE_TESTS=true PEDANT_ALLOW_RVM=1 - - rvm: 2.4.1 + - rvm: 2.5.0 env: SINGLE_ORG=true - - rvm: 2.4.1 + - rvm: 2.5.0 env: CHEF_FS=true # Commented out until we work with a released version again # - rvm: 2.2.5 @@ -33,17 +33,17 @@ matrix: # env: # - CHEF_FS=true # - "GEMFILE_MOD=\"gem 'chef', github: 'chef/chef'\"" - - rvm: 2.4.1 + - rvm: 2.5.0 env: FILE_STORE=true - - rvm: 2.4.1 + - rvm: 2.5.0 script: bundle exec rake chef_spec env: TEST=chef_spec - - rvm: 2.3.3 + - rvm: 2.5.0 script: bundle exec rake spec env: TEST=rake_spec - - rvm: 2.4.1 + - rvm: 2.4.3 script: bundle exec rake spec env: TEST=rake_spec - - rvm: 2.4.1 + - rvm: 2.5.0 script: bundle exec rake style env: TEST=chefstyle diff --git a/CHANGELOG.md b/CHANGELOG.md index a24a891..cc648ea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ +<!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ --> # Change Log +<!-- latest_release --> +<!-- latest_release --> + +<!-- release_rollup --> +<!-- release_rollup --> + +<!-- latest_stable_release --> ## [v13.1.0](https://github.com/chef/chef-zero/tree/v13.1.0) (2017-07-17) [Full Changelog](https://github.com/chef/chef-zero/compare/v13.0.0...v13.1.0) @@ -13,6 +21,7 @@ - Add skip-chef-zero-quirks to the defaults in chef-zero [\#263](https://github.com/chef/chef-zero/pull/263) ([jaymalasinha](https://github.com/jaymalasinha)) - Add skip-chef-zero-quirks to the defaults in chef-zero [\#262](https://github.com/chef/chef-zero/pull/262) ([jaymalasinha](https://github.com/jaymalasinha)) - Ensure that tests that use chef-zero git will work [\#259](https://github.com/chef/chef-zero/pull/259) ([thommay](https://github.com/thommay)) +<!-- latest_stable_release --> ## [v13.0.0](https://github.com/chef/chef-zero/tree/v13.0.0) (2017-04-03) [Full Changelog](https://github.com/chef/chef-zero/compare/v5.3.2...v13.0.0) @@ -540,7 +549,3 @@ ## [v0.9](https://github.com/chef/chef-zero/tree/v0.9) (2012-12-24) [Full Changelog](https://github.com/chef/chef-zero/compare/666374b272a8851a2c57530a71a6183d4d06a648...v0.9) - - - -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file @@ -7,12 +7,8 @@ group :pedant do gem "oc-chef-pedant", :git => "https://github.com/chef/chef-server.git" end -group :changelog do - gem "github_changelog_generator", :git => "https://github.com/chef/github-changelog-generator.git" -end - group :development, :test do - gem "chefstyle", "= 0.3.1" + gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master" end gem "chef", "~> 13" @@ -61,16 +61,3 @@ begin rescue LoadError puts "chefstyle/rubocop is not available. gem install chefstyle to do style checking." end - -begin - require "github_changelog_generator/task" - - GitHubChangelogGenerator::RakeTask.new :changelog do |config| - config.future_release = ChefZero::VERSION - config.issues = false - config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",") - config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",") - end -rescue LoadError - puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs" -end |