Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable expeditor #130

Merged
merged 3 commits into from
Jul 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions .expeditor/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Documentation available at http://expeditor.es.chef.io

# Slack channel in Chef Software slack to send notifications about build failures, etc
slack:
notify_channel: sustaining-notify

rubygems:
- knife-google

github:
# The tag format to use (e.g. v1.0.0)
version_tag_format: "v{{version}}"

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
12 changes: 12 additions & 0 deletions .expeditor/update_version.sh
Original file line number Diff line number Diff line change
@@ -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/knife-google/version.rb

# Once Expeditor finishes executing this script, it will commit the changes and push
# the commit as a new tag corresponding to the value in the VERSION file.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ cache: bundler
dist: trusty
sudo: false
rvm:
- 2.2.7
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got a big mangled here

- 2.3.4
- 2.4.2
- 2.4.1
- 2.3.4
- ruby-head

matrix:
Expand Down
28 changes: 27 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
# Change Log
# knife-google Change Log

Note: this log contains only changes from knife-google release 1.1.0 and later
-- it does not contain the changes from prior releases. To view change history
prior to release 1.1.0, please visit the [source repository](https://github.com/chef/knife-google/commits).

<!-- latest_release -->
<!-- latest_release -->

<!-- release_rollup -->
<!-- release_rollup -->

<!-- latest_stable_release -->
<!-- latest_stable_release -->

## [3.3.0](https://github.com/chef/knife-google/tree/v3.3.0)

[Full Changelog](https://github.com/chef/knife-google/compare/v3.2.0...v3.3.0)

- Increased the dependency on google-api-client from 0.9.X to 0.19.X to bring in the latest improvements to the API
- Remove the dependency on Chef entirely since it's assumed Chef is already installed

## [3.2.0](https://github.com/chef/knife-google/tree/v3.2.0)

[Full Changelog](https://github.com/chef/knife-google/compare/v3.1.1...v3.2.0)

- Loosen the dependency on Chef so this gem can work with Chef 13+

## [3.1.1](https://github.com/chef/knife-google/tree/v3.1.1)

Expand Down
1 change: 1 addition & 0 deletions VERSION
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.3.1
2 changes: 1 addition & 1 deletion lib/knife-google/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#
module Knife
module Google
VERSION = "3.2.0"
VERSION = "3.3.0"
MAJOR, MINOR, TINY = VERSION.split(".")
end
end