summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-22 12:40:35 -0800
committerTim Smith <tsmith@chef.io>2019-01-22 12:40:35 -0800
commitf6cc746ee00f76608d9b0254d5c00244b228fcd6 (patch)
tree89d9ad08997736bd89c37c132b9e34663c0e1d1a
parent49c4609d71974950f45c72d9fb801ce249d4108d (diff)
downloadchef-f6cc746ee00f76608d9b0254d5c00244b228fcd6.tar.gz
Update expeditor labels
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/config.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index fb5fa48acf..ffcebe8ad2 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -29,13 +29,13 @@ github:
# The file where our CHANGELOG is kept. This file is updated automatically with
# details from the Pull Request via the `built_in:update_changelog` merge_action.
changelog_file: "CHANGELOG.md"
- # This deletes the GitHub PR branch after successfully merged into the release branch
+ # Delete the PR branch after successfully merged into release branch.
delete_branch_on_merge: true
# The tag format to use (e.g. v1.0.0)
version_tag_format: "v{{version}}"
# allow bumping the minor release via label
minor_bump_labels:
- - "Expeditor: Bump Minor Version"
+ - "Expeditor: Bump Version Minor"
# Which Github branches to build Omnibus releases from, and what versions
# (as determined by the value in the VERSION file) those branches are responsible
# for building.
@@ -57,7 +57,7 @@ merge_actions:
only_if: built_in:bump_version
- built_in:update_changelog:
ignore_labels:
- - "Expeditor: Exclude From Changelog"
+ - "Expeditor: Skip Changelog"
- "Expeditor: Skip All"
- built_in:trigger_habitat_package_build:
ignore_labels:
@@ -66,7 +66,7 @@ merge_actions:
only_if: built_in:bump_version
- built_in:trigger_omnibus_release_build:
ignore_labels:
- - "Expeditor: Skip Build"
+ - "Expeditor: Skip Omnibus"
- "Expeditor: Skip All"
only_if: built_in:bump_version