diff options
| author | Tim Smith <tsmith@chef.io> | 2018-06-04 14:18:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-04 14:18:37 -0700 |
| commit | 462271b1e20a6984b1a09a8c578e42d5021dc6e9 (patch) | |
| tree | 8a19023e8ac75c7e4d3ca7a57e454a17d3b07232 | |
| parent | baecb164cdb0d94aea44120e34f59ffa72208d88 (diff) | |
| parent | 8b0ca619a96278506572c0db944da150ac69cc39 (diff) | |
| download | ohai-462271b1e20a6984b1a09a8c578e42d5021dc6e9.tar.gz | |
Merge pull request #1198 from chef/expeditor_13
Add expeditor config to the 13-stable branch
| -rw-r--r-- | .expeditor/config.yml | 44 | ||||
| -rwxr-xr-x | .expeditor/update_version.sh | 12 | ||||
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | VERSION | 1 |
4 files changed, 65 insertions, 0 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 00000000..327cb820 --- /dev/null +++ b/.expeditor/config.yml @@ -0,0 +1,44 @@ +# Documentation available at https://expeditor-docs.es.chef.io/ + +# Slack channel in Chef Software slack to send notifications about build failures, etc +slack: + notify_channel: chef-notify + +rubygems: + - ohai + +github: + # The tag format to use (e.g. v1.0.0) + version_tag_format: "v{{version}}" + # 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: 14.* + - 13-stable: + version_constraint: 13.* + - 8-stable: + version_constraint: 8.* + +promote: + action: + - built_in:publish_rubygems + - built_in:rollover_changelog + +# 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: + - "Meta: Exclude From Changelog" + - "Expeditor: Exclude From Changelog" + - "Expeditor: Skip All" + - built_in:build_gem: + only_if: built_in:bump_version diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh new file mode 100755 index 00000000..45d317e9 --- /dev/null +++ b/.expeditor/update_version.sh @@ -0,0 +1,12 @@ +#!/bin/sh +# +# After a PR merge, Chef Expeditor will bump the PATCH version in the VERSION file. +# It then executes this file to update any other files/components with that new version. +# + +set -evx + +sed -i -r "s/^(\s*)VERSION = \".+\"/\1VERSION = \"$(cat VERSION)\"/" lib/ohai/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. diff --git a/CHANGELOG.md b/CHANGELOG.md index f1cb6f77..e6a07e0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log +<!-- latest_release --> +<!-- latest_release --> + +<!-- release_rollup --> +<!-- release_rollup --> + +<!-- latest_stable_release --> ## [v13.9.0](https://github.com/chef/ohai/tree/v13.9.0) (2018-04-09) [Full Changelog](https://github.com/chef/ohai/compare/v13.8.0...v13.9.0) @@ -8,6 +15,7 @@ - Fix parsing of uptime on AIX - Add missing softlayer detection to the cloud plugin - Add detection of macOS guests running on VMware and VirtualBox +<!-- latest_stable_release --> ## [v13.8.0](https://github.com/chef/ohai/tree/v13.8.0) (2018-03-02) diff --git a/VERSION b/VERSION new file mode 100644 index 00000000..c662e83b --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +13.9.0 |