diff options
author | Thom May <thom@may.lt> | 2018-04-12 11:12:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-12 11:12:18 +0100 |
commit | a67ae938ec25cf0d7dd026eaf91295e598291f1e (patch) | |
tree | d0b15e7c4eebb8bdd6e4996aa286e31682a5e85e | |
parent | 7c4febf49c2c9ed9f5018ef25582bd80a2587ec9 (diff) | |
parent | 730c3d56327aae3a76764d774c6e954c96f38d37 (diff) | |
download | mixlib-authentication-a67ae938ec25cf0d7dd026eaf91295e598291f1e.tar.gz |
Merge pull request #31 from chef/tm/expedite
enable expeditor
-rw-r--r-- | .expeditor/config.yml | 43 | ||||
-rwxr-xr-x | .expeditor/update_version.sh | 12 | ||||
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | VERSION | 1 |
4 files changed, 63 insertions, 1 deletions
diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 0000000..1adc4e6 --- /dev/null +++ b/.expeditor/config.yml @@ -0,0 +1,43 @@ +# Documentation available at http://expeditor-docs.es.chef.io/ + +# Slack channel in Chef Software slack to send notifications about build failures, etc +slack: + notify_channel: chef-notify + +rubygems: + - mixlib-authentication + +github: + # The tag format to use (e.g. v1.0.0) + version_tag_format: "v{{version}}" + # The Github Team primarily responsible for handling incoming Pull Requests. + maintainer_group: chef/client-maintainers + # Which Github branches to build gems from, and what versions + # (as determined by the value in the VERSION file) those branches are responsible + # for building. + release_branch: + - master: + version_constraint: 1.* + +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 0000000..ba30cda --- /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/mixlib/authentication/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 6f209c6..b7e3959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,12 @@ # mixlib-authentication Changelog -## Unreleased +<!-- latest_release --> +<!-- latest_release --> +<!-- release_rollup --> +<!-- release_rollup --> + +<!-- latest_stable_release --> ## 1.4.2 (2017-08-17) - fix bug in ordering x_ops_authorization_n headers when headers @@ -9,6 +14,7 @@ - fix bug where a constant lookup fails when vendored into other projects [#24] - make mixlib-log optional [#21] +<!-- latest_stable_release --> ## 1.4.1 (2016-06-08) @@ -0,0 +1 @@ +1.4.2 |