summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2017-09-25 13:33:05 -0700
committerGitHub <noreply@github.com>2017-09-25 13:33:05 -0700
commit33a6efaa51fc675c5aea4f0e1c5e75da96c8ba29 (patch)
tree459e8efeda0bee132eff795dd59ee30e89d2306c
parent8226f94205e971cdd226a94f561279300bcdde88 (diff)
parentb85805f2322ba2cc6c1ef839eae712fcec6e97ad (diff)
downloadchef-33a6efaa51fc675c5aea4f0e1c5e75da96c8ba29.tar.gz
Merge pull request #6432 from chef/tm/expeditor_labels
update expeditor labels
-rw-r--r--.expeditor/config.yml5
1 files changed, 4 insertions, 1 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index 23c9a981df..a64b2cbab0 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -1,4 +1,4 @@
-# Documentation available at http://http://expeditor-docs.es.chef.io/
+# Documentation available at https://expeditor-docs.es.chef.io/
# The name of the product keys for this product (from mixlib-install)
product_key:
@@ -40,16 +40,19 @@ 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:trigger_omnibus_release_build:
ignore_labels:
- "Omnibus: Skip Build"
+ - "Expeditor: Skip Build"
- "Expeditor: Skip All"
only_if: built_in:bump_version