Backport the expeditor updates to 16-stable

Make sure all the workflows are configured here as well.

Signed-off-by: Tim Smith <tsmith@chef.io>

2 files changed, 30 insertions, 34 deletions

diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index be6f94ab..d82d3460 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -20,41 +20,37 @@ github:
   # 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.
-  release_branch:
-    - master:
-        version_constraint: 17.*
-    - 16-stable:
-        version_constraint: 16.*
-    - 15-stable:
-        version_constraint: 15.*
+
+# 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.
+release_branches:
+  - main:
+      version_constraint: 17.*
+  - 16-stable:
+      version_constraint: 16.*
 
 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:
-        - "Expeditor: Skip Version Bump"
-        - "Expeditor: Skip All"
-  - bash:.expeditor/update_version.sh:
-      only_if: built_in:bump_version
-  - built_in:update_changelog:
-      ignore_labels:
-        - "Expeditor: Skip Changelog"
-        - "Expeditor: Skip All"
-  - built_in:build_gem:
-      only_if: built_in:bump_version
-
-promote:
-  actions:
-    - built_in:rollover_changelog
-    - built_in:publish_rubygems
+subscriptions:
+  # These actions are taken, in order they are specified, anytime a Pull Request is merged.
+  - workload: pull_request_merged:{{github_repo}}:{{release_branch}}:*
+    actions:
+      - built_in:bump_version:
+          ignore_labels:
+            - "Expeditor: Skip Version Bump"
+            - "Expeditor: Skip All"
+      - bash:.expeditor/update_version.sh:
+          only_if: built_in:bump_version
+      - built_in:update_changelog:
+          ignore_labels:
+            - "Expeditor: Skip Changelog"
+            - "Expeditor: Skip All"
+      - built_in:build_gem:
+          only_if: built_in:bump_version
 
-pipelines:
-  - verify:
-      description: Pull Request validation tests
-      public: true
+  - workload: project_promoted:{{agent_id}}:*
+    actions:
+      - built_in:rollover_changelog
+      - built_in:publish_rubygems
diff --git a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md
index 80435f82..399de366 100644
--- a/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md
+++ b/.github/ISSUE_TEMPLATE/SUPPORT_QUESTION.md
@@ -5,7 +5,7 @@ about: If you have a question 💬, please check out our Slack!
 
 We use GitHub issues to track bugs and feature requests. If you need help please post to our Mailing List or join the Chef Community Slack.
 
-* Chef Community Slack at <http://community-slack.chef.io/.>
+* Chef Community Slack at <https://community-slack.chef.io/.>
 * Chef Mailing List <https://discourse.chef.io/>
 
  Support issues opened here will be closed and redirected to Slack or Discourse.