Improve the expeditor config

rollover the changelog
add a changelog note for unreleased changes
remove labels we don't have
cleanup deprecated config items

Signed-off-by: Tim Smith <[email protected]>

.expeditor/config.yml

@@ -1,30 +1,41 @@
+# Documentation available at https://expeditor.chef.io/docs/getting-started/
+---
+# Slack channel in Chef Software slack to send notifications about build failures, etc
 slack:
   notify_channel: releng-notify
 
+# This publish is triggered by the `built_in:publish_rubygems` artifact_action.
+rubygems:
+  - mixlib-install
+
 github:
+  # This deletes the GitHub PR branch after successfully merged into the release branch
   delete_branch_on_merge: true
-  version_tag_format: v{{version}}
+  # 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:
-    - "Version: Bump Minor"
+    - "Expeditor: Bump Minor Version"
 
-rubygems:
-  - mixlib-install
+changelog:
+  rollup_header: Changes not yet released to rubygems.org
 
+# 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"
+        - "Expeditor: Skip Version Bump"
         - "Expeditor: Skip All"
   - bash:.expeditor/update_version.sh:
       only_if: built_in:bump_version
   - built_in:update_changelog:
       ignore_labels:
-        - "Changelog: Skip Update"
+        - "Expeditor: Exclude From Changelog"
         - "Expeditor: Skip All"
   - built_in:build_gem:
-      only_if:
-        - built_in:bump_version
+      only_if: built_in:bump_version
 
 promote:
-  action:
+  actions:
+    - built_in:rollover_changelog
     - built_in:publish_rubygems

.expeditor/update_version.sh

@@ -7,3 +7,6 @@
 set -evx
 
 sed -i -r "s/VERSION = \".+\"/VERSION = \"$(cat VERSION)\"/" lib/mixlib/install/version.rb
+
+# Once Expeditor finshes executing this script, it will commit the changes and push
+# the commit as a new tag corresponding to the value in the VERSION file.