diff options
| author | Tom Duffield <tom@chef.io> | 2017-09-12 13:15:10 -0500 |
|---|---|---|
| committer | Tom Duffield <tom@chef.io> | 2017-09-12 13:15:10 -0500 |
| commit | aeb323365644ad6b82d7f44df48950885564265f (patch) | |
| tree | c058e44d8042a841f6ee16cd1b7f40fb897ecb8e | |
| parent | f7173b4ff9e33443c53ede3a657f6332908666e8 (diff) | |
| download | chef-tduffield/expeditor/update-config.tar.gz | |
Update Expeditor config to meet new standardstduffield/expeditor/update-config
Signed-off-by: Tom Duffield <tom@chef.io>
| -rw-r--r-- | .expeditor/config.yml | 50 |
1 files changed, 14 insertions, 36 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml index e51cf1e517..3c90fb9b6c 100644 --- a/.expeditor/config.yml +++ b/.expeditor/config.yml @@ -28,21 +28,27 @@ github: # (as determined by the value in the VERSION file) those branches are responsible # for building. release_branch: - master: - version_constraint: ~> 13.0 - chef-12: - version_constraint: ~> 12.0 + - master: + version_constraint: ~> 13.0 + - chef-12: + version_constraint: ~> 12.0 # 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" + ignore_labels: + - "Version: Skip 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" + ignore_labels: + - "Meta: Exclude From Changelog" + - "Expeditor: Skip All" - built_in:trigger_omnibus_release_build: - ignore_labels: "Omnibus: Skip Build" + ignore_labels: + - "Omnibus: Skip Build" + - "Expeditor: Skip All" only_if: built_in:bump_version # These actions are taken, in the order specified, when an Omnibus artifact is promoted @@ -57,32 +63,4 @@ artifact_actions: - built_in:publish_rubygems - built_in:rollover_changelog - bash:.expeditor/update_dockerfile.sh - - -############################################################################### -# Notes on the tags inside CHANGELOG.md -############################################################################### -# latest_release -# The content inside this block contains the most recent Pull Request to be -# merged into the repository. When the `built_in:update_changelog` merge_action -# is triggered, the content of this block is updated to reflect the most recent -# Pull Request merged. -# -# release_rollup -# This block contains all the Pull Requests merged since the most recent -# Stable release. When the `built_in:update_changelog` merge_action is triggered, -# the content inside this block is updated to include the most recent Pull Request -# merged. When the `built_in:rollover_changelog` artifact_action is trggered, -# the line items (each `-` line) are evaluated based on the version in the tags -# at the end of the line (e.g. `<!-- 13.0.0 -->`). If the version is more recent -# than the version that was just promoted (e.g. `> STABLE`), it is left in the -# release_rollup section. Otherwise, it is moved into the `latest_stable_release` -# section. -# -# latest_stable_release -# This block contains a list of all the changes that were released in the latest -# stable version. When the `built_in:rollover_changelog` artifact_action is triggerd, -# the content inside this block is moved underneath it and the block is updated with -# all of the line item chanages from the `release_rollup` block that were included in -# the just released stable build (e.g. `> STABLE-1, <= STABLE`) -# + - built_in:notify_chefio_slack_channels |