summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Duffield <tom@chef.io>2021-06-16 14:35:26 -0500
committerGitHub <noreply@github.com>2021-06-16 14:35:26 -0500
commit94e14f54a0dd5562dc6ed9204acdc043b1866fd4 (patch)
treea1ef18201d19d9b347bd96db4f9aed2124d4e22c
parente2fe8eb41634152e192575c3daf27d338fc8f816 (diff)
parent4679af3c5f7c482a5958af21fe45b86df9e33a75 (diff)
downloadchef-94e14f54a0dd5562dc6ed9204acdc043b1866fd4.tar.gz
Merge pull request #11710 from chef/update-expeditor-configuration
updating Expeditor configuration
-rw-r--r--.expeditor/config.yml70
1 files changed, 37 insertions, 33 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml
index f87694b89e..869d7e0c23 100644
--- a/.expeditor/config.yml
+++ b/.expeditor/config.yml
@@ -42,43 +42,23 @@ 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*
- - chef-16:
- version_constraint: 16*
- - chef-15:
- 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:
+ - master:
+ version_constraint: 17*
+ - chef-16:
+ version_constraint: 16*
+ - chef-15:
+ version_constraint: 15*
+ - chef-14:
+ version_constraint: 14*
changelog:
rollup_header: Changes not yet released to stable
-# 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"
- - trigger_pipeline:habitat/build:
- ignore_labels:
- - "Expeditor: Skip Habitat"
- - "Expeditor: Skip All"
- only_if: built_in:bump_version
- - trigger_pipeline:omnibus/release:
- ignore_labels:
- - "Expeditor: Skip Omnibus"
- - "Expeditor: Skip All"
- only_if: built_in:bump_version
-
subscriptions:
# the omnibus/docker/gem chain
- workload: artifact_published:unstable:chef:{{version_constraint}}
@@ -96,6 +76,30 @@ subscriptions:
- built_in:promote_habitat_packages
- built_in:notify_chefio_slack_channels
+ # 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"
+ - trigger_pipeline:habitat/build:
+ ignore_labels:
+ - "Expeditor: Skip Habitat"
+ - "Expeditor: Skip All"
+ only_if: built_in:bump_version
+ - trigger_pipeline:omnibus/release:
+ ignore_labels:
+ - "Expeditor: Skip Omnibus"
+ - "Expeditor: Skip All"
+ only_if: built_in:bump_version
+
# the habitat chain
- workload: buildkite_hab_build_group_published:{{agent_id}}:*
actions: