From 94b616bdfad177daa99f5e87535943f509198f6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Fri, 30 Jul 2021 11:53:27 +0200 Subject: [PATCH 1/5] config: Fix a potential deadlock in config reading Note that the deadlock has not been seen earlier, in tests on in real Hugo sites. Fixes #8791 --- config/defaultConfigProvider.go | 1 + 1 file changed, 1 insertion(+) diff --git a/config/defaultConfigProvider.go b/config/defaultConfigProvider.go index 05c3b912..2391ec85 100644 --- a/config/defaultConfigProvider.go +++ b/config/defaultConfigProvider.go @@ -89,6 +89,7 @@ func (c *defaultConfigProvider) Get(k string) interface{} { c.mu.RLock() key, m := c.getNestedKeyAndMap(strings.ToLower(k), false) if m == nil { + c.mu.RUnlock() return nil } v := m[key] From b75d4526e499fdf3241ed6b0df3ac9f0eea11279 Mon Sep 17 00:00:00 2001 From: hugoreleaser Date: Fri, 30 Jul 2021 10:13:32 +0000 Subject: [PATCH 2/5] releaser: Add release notes for 0.86.1 [ci skip] --- temp/0.86.1-relnotes-ready.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 temp/0.86.1-relnotes-ready.md diff --git a/temp/0.86.1-relnotes-ready.md b/temp/0.86.1-relnotes-ready.md new file mode 100644 index 00000000..68686237 --- /dev/null +++ b/temp/0.86.1-relnotes-ready.md @@ -0,0 +1,8 @@ + + +This is a bug-fix release with one important fix. + +* config: Fix a potential deadlock in config reading [94b616bd](https://github.com/gohugoio/hugo/commit/94b616bdfad177daa99f5e87535943f509198f6f) [@bep](https://github.com/bep) [#8791](https://github.com/gohugoio/hugo/issues/8791) + + + From 580d320a66cd4d1bc7b5a310a0dc5f0ff5b62f09 Mon Sep 17 00:00:00 2001 From: hugoreleaser Date: Fri, 30 Jul 2021 10:13:32 +0000 Subject: [PATCH 3/5] releaser: Bump versions for release of 0.86.1 [ci skip] --- common/hugo/version_current.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/hugo/version_current.go b/common/hugo/version_current.go index 0ccecb3e..a717038b 100644 --- a/common/hugo/version_current.go +++ b/common/hugo/version_current.go @@ -17,6 +17,6 @@ package hugo // This should be the only one. var CurrentVersion = Version{ Number: 0.86, - PatchLevel: 0, + PatchLevel: 1, Suffix: "", } From f6821b88abbc1237af0e28cefbc624e6cda3305a Mon Sep 17 00:00:00 2001 From: hugoreleaser Date: Fri, 30 Jul 2021 10:13:32 +0000 Subject: [PATCH 4/5] releaser: Add release notes to /docs for release of 0.86.1 [ci skip] --- docs/content/en/news/0.86.1-relnotes/index.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 docs/content/en/news/0.86.1-relnotes/index.md diff --git a/docs/content/en/news/0.86.1-relnotes/index.md b/docs/content/en/news/0.86.1-relnotes/index.md new file mode 100644 index 00000000..4c192638 --- /dev/null +++ b/docs/content/en/news/0.86.1-relnotes/index.md @@ -0,0 +1,19 @@ + +--- +date: 2021-07-30 +title: "Hugo 0.86.1: A couple of Bug Fixes" +description: "This version fixes a couple of bugs introduced in 0.86.0." +categories: ["Releases"] +images: +- images/blog/hugo-bug-poster.png + +--- + + + +This is a bug-fix release with one important fix. + +* config: Fix a potential deadlock in config reading [94b616bd](https://github.com/gohugoio/hugo/commit/94b616bdfad177daa99f5e87535943f509198f6f) [@bep](https://github.com/bep) [#8791](https://github.com/gohugoio/hugo/issues/8791) + + + From 7aa8b1cd7d05683d5d7c1f84d970463471908f8e Mon Sep 17 00:00:00 2001 From: hugoreleaser Date: Fri, 30 Jul 2021 10:54:50 +0000 Subject: [PATCH 5/5] releaser: Prepare repository for 0.87.0-DEV [ci skip] --- common/hugo/version_current.go | 6 +++--- snap/snapcraft.yaml | 2 +- temp/0.86.1-relnotes-ready.md | 8 -------- 3 files changed, 4 insertions(+), 12 deletions(-) delete mode 100644 temp/0.86.1-relnotes-ready.md diff --git a/common/hugo/version_current.go b/common/hugo/version_current.go index a717038b..0648ef72 100644 --- a/common/hugo/version_current.go +++ b/common/hugo/version_current.go @@ -16,7 +16,7 @@ package hugo // CurrentVersion represents the current build version. // This should be the only one. var CurrentVersion = Version{ - Number: 0.86, - PatchLevel: 1, - Suffix: "", + Number: 0.87, + PatchLevel: 0, + Suffix: "-DEV", } diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index cb7655ed..ecf7063e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -8,7 +8,7 @@ description: | license: "Apache-2.0" base: core20 confinement: strict -grade: stable # "devel" or "stable" +grade: devel # "devel" or "stable" apps: hugo: diff --git a/temp/0.86.1-relnotes-ready.md b/temp/0.86.1-relnotes-ready.md deleted file mode 100644 index 68686237..00000000 --- a/temp/0.86.1-relnotes-ready.md +++ /dev/null @@ -1,8 +0,0 @@ - - -This is a bug-fix release with one important fix. - -* config: Fix a potential deadlock in config reading [94b616bd](https://github.com/gohugoio/hugo/commit/94b616bdfad177daa99f5e87535943f509198f6f) [@bep](https://github.com/bep) [#8791](https://github.com/gohugoio/hugo/issues/8791) - - -