diff --git a/.expeditor/config.yml b/.expeditor/config.yml new file mode 100644 index 0000000..7c449b6 --- /dev/null +++ b/.expeditor/config.yml @@ -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 diff --git a/.expeditor/update_version.sh b/.expeditor/update_version.sh new file mode 100644 index 0000000..b1a168a --- /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/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. diff --git a/.travis.yml b/.travis.yml index 2497e3b..be96901 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ cache: bundler dist: trusty sudo: false rvm: - - 2.2.7 - - 2.3.4 + - 2.4.2 - 2.4.1 + - 2.3.4 - ruby-head matrix: diff --git a/CHANGELOG.md b/CHANGELOG.md index 2752a69..5e60646 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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). + + + + + + + + + + +## [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) diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..bea438e --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +3.3.1 diff --git a/lib/knife-google/version.rb b/lib/knife-google/version.rb index 037e753..6a13bda 100644 --- a/lib/knife-google/version.rb +++ b/lib/knife-google/version.rb @@ -15,7 +15,7 @@ # module Knife module Google - VERSION = "3.2.0" + VERSION = "3.3.0" MAJOR, MINOR, TINY = VERSION.split(".") end end