summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2018-08-11 11:11:09 -0700
committerGitHub <noreply@github.com>2018-08-11 11:11:09 -0700
commitbabe853de9369cd86742c112903ec51e1c378e95 (patch)
treeb80f185961229f75762a1c87d6eb09389e67c9c0
parent4443040ce19561764b44aa67a6177391b667085b (diff)
parent90998528bff99d17dcc48566de9e4dd431c6bacd (diff)
downloadohai-babe853de9369cd86742c112903ec51e1c378e95.tar.gz
Merge pull request #1232 from chef/expeditor
Remove old labels from the expeditor config
-rw-r--r--.expeditor/config.yml4
1 files changed, 1 insertions, 3 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 23e11a1d..d1a9640a 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -8,7 +8,7 @@ rubygems:
- ohai
github:
- # Cleanup merged PR branches
+ # This deletes the GitHub PR branch after successfully merged into the release branch
delete_branch_on_merge: true
# The tag format to use (e.g. v1.0.0)
version_tag_format: "v{{version}}"
@@ -33,14 +33,12 @@ promote:
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:build_gem: