Skip to content

Commit 832453e

Browse files
authored
Merge pull request #163 from puppetlabs/release-prep
Release prep for v1.8.1
2 parents fa47385 + d7dade3 commit 832453e

File tree

3 files changed

+37
-4
lines changed

3 files changed

+37
-4
lines changed

CHANGELOG.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,20 @@
33
All significant changes to this repo will be summarized in this file.
44

55

6+
## [v1.8.1](https://github.com/puppetlabs/puppet-resource_api/tree/v1.8.1) (2019-03-13)
7+
[Full Changelog](https://github.com/puppetlabs/puppet-resource_api/compare/v1.8.0...v1.8.1)
8+
9+
**Fixed bugs:**
10+
11+
- \(maint\) Fixes sensitive transport values where absent keys are wrapped [\#161](https://github.com/puppetlabs/puppet-resource_api/pull/161) ([da-ar](https://github.com/da-ar))
12+
13+
**Merged pull requests:**
14+
15+
- 1.6.x mergeup [\#162](https://github.com/puppetlabs/puppet-resource_api/pull/162) ([DavidS](https://github.com/DavidS))
16+
- \(FM-7829\) Update README with transports examples [\#160](https://github.com/puppetlabs/puppet-resource_api/pull/160) ([willmeek](https://github.com/willmeek))
17+
- \(maint\) update release docs [\#159](https://github.com/puppetlabs/puppet-resource_api/pull/159) ([DavidS](https://github.com/DavidS))
18+
- Improve travis cells and testing [\#145](https://github.com/puppetlabs/puppet-resource_api/pull/145) ([DavidS](https://github.com/DavidS))
19+
620
## [v1.8.0](https://github.com/puppetlabs/puppet-resource_api/tree/v1.8.0) (2019-02-26)
721
[Full Changelog](https://github.com/puppetlabs/puppet-resource_api/compare/v1.7.0...v1.8.0)
822

@@ -22,6 +36,7 @@ All significant changes to this repo will be summarized in this file.
2236

2337
**Merged pull requests:**
2438

39+
- Release prep for v1.8.0 [\#158](https://github.com/puppetlabs/puppet-resource_api/pull/158) ([DavidS](https://github.com/DavidS))
2540
- \(FM-7726\) cleanups for the transport [\#153](https://github.com/puppetlabs/puppet-resource_api/pull/153) ([DavidS](https://github.com/DavidS))
2641
- \(FM-7691,FM-7696\) refactoring definition handling in contexts [\#150](https://github.com/puppetlabs/puppet-resource_api/pull/150) ([DavidS](https://github.com/DavidS))
2742

README.md

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,24 @@ Future possibilities:
344344

345345
Bug reports and pull requests are welcome on GitHub at https://github.com/puppetlabs/puppet-resource_api.
346346

347-
## Cutting a release
348-
349-
To cut a new release, follow the ["Special case: the resource API" instructions](https://confluence.puppetlabs.com/display/systemsEngineering/Puppet+Agent+Release+Lead+Guide) on confluence.
347+
### Cutting a release
348+
349+
In some cases we need to manually cut a release outside of the regular puppet
350+
agent process.
351+
352+
To do so, follow these instructions from a current `master` checkout:
353+
354+
* Start the release branch with `git checkout -b release-prep`
355+
* Update `lib/puppet/resource_api/version.rb` to the new version
356+
* Update the CHANGELOG
357+
* Have a [CHANGELOG_GITHUB_TOKEN](https://github.com/skywinder/github-changelog-generator#github-token) set in your environment
358+
* run `rake changelog`
359+
* double check the PRs to make sure they're all tagged correctly (using the new CHANGELOG for cross-checking)
360+
* Check README and other materials for up-to-date-ness
361+
* Commit changes with title "Release prep for v\<VERSION>"
362+
* Upload and PR the release-prep branch to the puppetlabs GitHub repo
363+
* Check that CI is green and merge the PR
364+
* Run `rake release[upstream]` to release from your checkout
365+
* make sure to use the name of your git remote pointing to the puppetlabs GitHub repo
366+
* Remove the release-prep branch
367+
* Send the release announcements using the template in [misc/ANNOUNCEMENT_TEMPLATE.md](misc/ANNOUNCEMENT_TEMPLATE.md)

lib/puppet/resource_api/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Puppet
22
module ResourceApi
3-
VERSION = '1.8.0'.freeze
3+
VERSION = '1.8.1'.freeze
44
end
55
end

0 commit comments

Comments
 (0)