Skip to content

Commit

Permalink
Merge tag '1.2.0-rc2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jhillyerd committed Dec 16, 2017
2 parents f597687 + 86554a6 commit db358fe
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .goxc.json
Expand Up @@ -7,12 +7,12 @@
"Os": "darwin freebsd linux windows",
"ResourcesInclude": "README*,LICENSE*,CHANGELOG*,inbucket.bat,etc,themes",
"PackageVersion": "1.2.0",
"PrereleaseInfo": "rc1",
"PrereleaseInfo": "rc2",
"ConfigVersion": "0.9",
"BuildSettings": {
"LdFlagsXVars": {
"TimeNow": "main.BUILDDATE",
"Version": "main.VERSION"
}
}
}
}
7 changes: 4 additions & 3 deletions CHANGELOG.md
Expand Up @@ -4,8 +4,8 @@ Change Log
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).

[Unreleased]
------------
[1.2.0-rc2] - 2017-12-15
------------------------

### Added
- `rest/client` types `MessageHeader` and `Message` with convenience methods;
Expand Down Expand Up @@ -92,6 +92,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
specific message.

[Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop
[1.2.0-rc2]: https://github.com/jhillyerd/inbucket/compare/1.2.0-rc1...1.2.0-rc2
[1.2.0-rc1]: https://github.com/jhillyerd/inbucket/compare/1.1.0...1.2.0-rc1
[1.1.0]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc2...1.1.0
[1.1.0-rc2]: https://github.com/jhillyerd/inbucket/compare/1.1.0-rc1...1.1.0-rc2
Expand All @@ -107,7 +108,7 @@ Release Checklist
- Ensure *Unreleased* section is up to date
- Rename *Unreleased* section to release name and date.
- Add new GitHub `/compare` link
3. Update goxc version info: `goxc -wc -pv=1.x.0 -pr=snapshot`
3. Update goxc version info: `goxc -wc -pv=1.x.0 -pr=rc1`
4. Run: `goxc interpolate-source` to update VERSION var
5. Run tests
6. Test cross-compile: `goxc`
Expand Down
2 changes: 1 addition & 1 deletion inbucket.go
Expand Up @@ -24,7 +24,7 @@ import (

var (
// VERSION contains the build version number, populated during linking by goxc
VERSION = "1.2.0-rc1"
VERSION = "1.2.0-rc2"

// BUILDDATE contains the build date, populated during linking by goxc
BUILDDATE = "undefined"
Expand Down

0 comments on commit db358fe

Please sign in to comment.