diff options
| author | Tim Smith <tsmith@chef.io> | 2018-07-10 16:00:00 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2018-07-10 16:01:05 -0700 |
| commit | af483f5a94d5e00313fe322b713ac69e3d9e0a75 (patch) | |
| tree | 11daa006c42dde7cbe8b3eb867bdad37ec0d3e9b | |
| parent | 52852cb893fe10aab22eeaa2a8eda5f8b5a2a38d (diff) | |
| download | chef-af483f5a94d5e00313fe322b713ac69e3d9e0a75.tar.gz | |
Update Expeditor to cleanup merged PRs
Nuke the Chef 12 config and old labels while I'm in here as well.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | .expeditor/config.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 5ca063bfcc..1812d7ba45 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -18,6 +18,8 @@ docker_images: - chef github: + # cleanup PR branches post merge + delete_branch_on_merge: true # The file where the MAJOR.MINOR.PATCH version is kept. The version in this file # is bumped automatically via the `built_in:bump_version` merge_action. version_file: "VERSION" @@ -39,26 +41,21 @@ github: version_constraint: 14.* - chef-13: version_constraint: 13.* - - chef-12: - version_constraint: 12.* # These actions are taken, in order they are specified, anytime a Pull Request is merged. merge_actions: - built_in:bump_version: ignore_labels: - - "Version: Skip Bump" - "Expeditor: Skip Version Bump" - "Expeditor: Skip All" - bash:.expeditor/update_version.sh: only_if: built_in:bump_version - built_in:update_changelog: ignore_labels: - - "Meta: Exclude From Changelog" - "Expeditor: Exclude From Changelog" - "Expeditor: Skip All" - built_in:trigger_omnibus_release_build: ignore_labels: - - "Omnibus: Skip Build" - "Expeditor: Skip Build" - "Expeditor: Skip All" only_if: built_in:bump_version |