summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2019-10-02 09:41:11 -0700
committerTim Smith <tsmith84@gmail.com>2019-10-02 09:41:11 -0700
commit6b1ed517a0d66a90c3b651ab76fc542fe3de0d4f (patch)
treee9209ed9d49feb0611fbc3bef0127efca70e380f
parent7ae483c1f8d1cd3307a5d85c310df7a476799721 (diff)
downloadchef-6b1ed517a0d66a90c3b651ab76fc542fe3de0d4f.tar.gz
Update expeditor config to more modern version
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.expeditor/config.yml18
1 files changed, 8 insertions, 10 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 95afe24a47..c4c62bf1d2 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -6,7 +6,7 @@ product_key:
# Slack channel in Chef Software slack to send notifications about build failures, etc
slack:
- notify_channel: chef-notify
+ notify_channel: chef-infra-notify
# Which Ruby Gems, built when the Omnibus package is built, to publish to rubygems.org
# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
@@ -31,19 +31,16 @@ pipelines:
- ADHOC: true
github:
- # 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"
- # 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"
- # Delete the PR branch after successfully merged into release branch.
+ # 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}}"
# allow bumping the minor release via label
minor_bump_labels:
- "Expeditor: Bump Version Minor"
+ # allow bumping the major release via label
+ major_bump_labels:
+ - "Expeditor: Bump Version Major"
# 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.
@@ -52,8 +49,9 @@ github:
version_constraint: 15*
- chef-14:
version_constraint: 14*
- - chef-13:
- version_constraint: 13*
+
+changelog:
+ rollup_header: Changes not yet released to stable
# These actions are taken, in order they are specified, anytime a Pull Request is merged.
merge_actions: