summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2017-07-13 08:31:05 -0500
committerSeth Chisamore <schisamo@chef.io>2017-07-13 19:38:32 -0400
commit6059e9e6904a3ffb8271f3677f5a6ca19ab2f5ec (patch)
tree86f177c945638bbd00dddef848c488c74251d8e6
parent29d263b1efca29664897d22f1f692d0c165c54f7 (diff)
downloadchef-tduffield/update-expeditor-config.tar.gz
Use new Expeditor config formattduffield/update-expeditor-config
Signed-off-by: Tom Duffield <tom@chef.io>
-rw-r--r--.expeditor/config.yml22
1 files changed, 9 insertions, 13 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index fcf7377c93..2f23fb2b2e 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -14,18 +14,14 @@ docker:
VERSION: "{{version}}"
github:
- # The file where the MAJOR.MINOR.PATCH version is kept
- version_file: "VERSION"
-
- # When a PR is merged, bump the PATCH version
- bump_version_on_merge: true
-
- # After the PATCH version has been bumped, execute this script
- # to distribute that version to other files in the repository.
- update_version_script: ".expeditor/update_version.sh"
-
- # The tag format Expeditor should use when tagging version commits
version_tag_format: "v{{version}}"
+ maintainer_group: chef/client-core
- # After the version is bumped and the tag is pushed to Github, trigger a Jenkins build
- trigger_build_on_bump: true
+merge_actions:
+ built_in:bump_version:
+ ignore_labels: "Version: Skip Bump"
+ bash:.expeditor/update_version.sh:
+ only_if: built_in:bump_version
+ built_in:trigger_omnibus_release_build:
+ ignore_labels: "Omnibus: Skip Build"
+ only_if: built_in:bump_version