diff options
| author | Tim Smith <tsmith@chef.io> | 2019-01-16 09:37:17 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-16 09:37:17 -0800 |
| commit | a24649f8d3cf0108b6acccde76953d8d145afa04 (patch) | |
| tree | 1d23ddc0c6599091eea2037ccd3700d93aa5f27b | |
| parent | dca5df82679f7f53d45685acf987fc68ce384ca5 (diff) | |
| parent | ebd614420d42f167f4f624fa5c01c28195921e38 (diff) | |
| download | chef-a24649f8d3cf0108b6acccde76953d8d145afa04.tar.gz | |
Merge pull request #8114 from chef/tags
Update expeditor config for the new labels
| -rw-r--r-- | .expeditor/config.yml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index 9ef3c00cd3..7d4d29f38a 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -28,13 +28,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. @@ -56,7 +56,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: @@ -65,7 +65,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 |