From 704ba04c5121c88b0888ec45da463c2c1b9277dd Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 7 Apr 2018 19:52:49 -0700 Subject: [PATCH 1/7] travis: specify go 1.10.1 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f45a552..daaec6b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ before_script: - make deps go: - - "1.10.x" + - "1.10.1" deploy: provider: script From 7fc5e0651700977d54608969cc93f14a8d02c79b Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 7 Apr 2018 20:22:38 -0700 Subject: [PATCH 2/7] travis: install rpm --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index daaec6b..7d697ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,11 @@ language: go sudo: false +addons: + apt: + packages: + - rpm + env: - DEPLOY_WITH_MAJOR="1.10" From 562332258d87ee05ec5fb74fc725ece10ad821ca Mon Sep 17 00:00:00 2001 From: evilmrburns <35606202+evilmrburns@users.noreply.github.com> Date: Sat, 21 Apr 2018 13:01:10 -0400 Subject: [PATCH 3/7] Fix INBUCKET_STORAGE_PARAMS example (#95) --- doc/config.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/config.md b/doc/config.md index 1342cb7..f932d01 100644 --- a/doc/config.md +++ b/doc/config.md @@ -373,7 +373,7 @@ Parameters specific to the storage type selected. Formatted as a comma separated list of key:value pairs. - Default: None -- Examples: `maxkb=10240` or `path=/tmp/inbucket` +- Examples: `maxkb:10240` or `path:/tmp/inbucket` #### `file` type parameters From 568474da320071a916c73d555d80cee4dbc7283b Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 5 May 2018 09:36:46 -0700 Subject: [PATCH 4/7] travis: back to 1.10.x --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7d697ca..c181bff 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ before_script: - make deps go: - - "1.10.1" + - "1.10.x" deploy: provider: script From 62fa52f42ce7ce2dedd81c68dec06c5442d32d73 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 5 May 2018 09:57:01 -0700 Subject: [PATCH 5/7] log: disable color output on windows, closes #93 --- cmd/inbucket/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/inbucket/main.go b/cmd/inbucket/main.go index 30152c9..88df1ab 100644 --- a/cmd/inbucket/main.go +++ b/cmd/inbucket/main.go @@ -181,7 +181,7 @@ func openLog(level string, logfile string, json bool) (close func(), err error) } close = func() {} var w io.Writer - color := true + color := runtime.GOOS != "windows" switch logfile { case "stderr": w = os.Stderr From 2ceb510f7005f2d25a1172c3ef61341f7290e84c Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 5 May 2018 10:08:40 -0700 Subject: [PATCH 6/7] Update change log --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 278a868..aad5729 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [Unreleased] + +### Changed +- Corrected docs for INBUCKET_STORAGE_PARAMS (thanks evilmrburns.) +- Disabled color log output on Windows, doesn't work there. + ## [2.0.0-rc1] - 2018-04-07 ### Added From 37361e08e8097ade6e3cf3dc56a669c6002a1dd0 Mon Sep 17 00:00:00 2001 From: James Hillyerd Date: Sat, 5 May 2018 10:13:20 -0700 Subject: [PATCH 7/7] Change log release prep --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aad5729..eb3ddca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,13 +4,13 @@ Change Log All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [Unreleased] +## [v2.0.0] - 2018-05-05 ### Changed - Corrected docs for INBUCKET_STORAGE_PARAMS (thanks evilmrburns.) - Disabled color log output on Windows, doesn't work there. -## [2.0.0-rc1] - 2018-04-07 +## [v2.0.0-rc1] - 2018-04-07 ### Added - Inbucket is now configured using environment variables instead of a config @@ -160,6 +160,7 @@ This project adheres to [Semantic Versioning](http://semver.org/). specific message. [Unreleased]: https://github.com/jhillyerd/inbucket/compare/master...develop +[v2.0.0]: https://github.com/jhillyerd/inbucket/compare/v2.0.0-rc1...v2.0.0 [v2.0.0-rc1]: https://github.com/jhillyerd/inbucket/compare/v1.3.1...v2.0.0-rc1 [v1.3.1]: https://github.com/jhillyerd/inbucket/compare/v1.3.0...v1.3.1 [v1.3.0]: https://github.com/jhillyerd/inbucket/compare/v1.2.0...v1.3.0