Compare commits

...

5 Commits

Author SHA1 Message Date
Renovator Bot 6d8ed508fa chore(deps): update dependency gohugoio/hugo to v0.84.0 (#5)
continuous-integration/drone/push Build is passing Details
continuous-integration/drone/tag Build is passing Details
This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [gohugoio/hugo](https://github.com/gohugoio/hugo) | minor | `v0.83.1` -> `v0.84.0` |

---

### Release Notes

<details>
<summary>gohugoio/hugo</summary>

### [`v0.84.0`](https://github.com/gohugoio/hugo/releases/v0.84.0)

[Compare Source](https://github.com/gohugoio/hugo/compare/v0.83.1...v0.84.0)

This release brings several configuration fixes and improvements that will be especially useful for themes.

#### Deep merge of theme Params

One of the most common complaint from Hugo theme owners/users has been about the configuration handling. Hugo has up until now only performed a shallow merge of theme `params` into the configuration.

With that, given this example from a theme configuration:

```toml
[params]
[params.colours]
blue="#&#8203;337DFF"
green="#&#8203;68FF33"
red="#FF3358"
```

If you would like to use the above theme, but want a different shade of red, you earlier had to copy the entire block, even the colours you're totally happy with. This was painful even the simplest setup.

Now you can just override the `params` keys you want to change, e.g.:

```toml
[params]
[params.colours]
red="#fc0f03"
```

For more information, and especially about the way you can opt out of the above behaviour, see [Merge Configuration from Themes](https://gohugo.io/getting-started/configuration/#merge-configuration-from-themes).

#### Themes now support the config directory

Now both the project and themes/modules can store its configuration in both the top level config file (e.g. `config.toml`) or in the `config` directory. See [Configuration Directory](https://gohugo.io/getting-started/configuration/#configuration-directory).

#### HTTP headers in getJSON/getCSV

`getJSON` now supports custom HTTP headers. This has been a big limitation in Hugo, especially considering the [Authorization](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization) header.

We have updated the internal Instagram shortcode to pass the access token in a header:

    {{ $hideCaption := cond (eq (.Get 1) "hidecaption") "1" "0" }}
    {{ $headers := dict "Authorization" (printf "Bearer %s" $accessToken) }}
    {{ with getJSON "https://graph.facebook.com/v8.0/instagram_oembed/?url=https://instagram.com/p/" $id "/&hidecaption=" $hideCaption $headers }}
        {{ .html | safeHTML }}
    {{ end }}

Also see the discussion [this issue](https://github.com/gohugoio/hugo/issues/7879) about the access token above.

#### New erroridf template func

Sometime, especially when creating themes, it is useful to be able to let the user decide if an error situation is critical enough to fail the build. The new `erroridf` produces `ERROR` log statements that can be toggled off:

```html
{{ erroridf "some-custom-id" "Some error message." }}
```

Will log:

    ERROR: Some error message.
    If you feel that this should not be logged as an ERROR, you can ignore it by adding this to your site config:
    ignoreErrors = ["some-custom-id"]

#### Stats

This release represents **46 contributions by 11 contributors** to the main Hugo code base.[@&#8203;bep](https://github.com/bep) leads the Hugo development with a significant amount of contributions, but also a big shoutout to [@&#8203;jmooring](https://github.com/jmooring), [@&#8203;satotake](https://github.com/satotake), and [@&#8203;Seirdy](https://github.com/Seirdy) for their ongoing contributions.
And a big thanks to [@&#8203;digitalcraftsman](https://github.com/digitalcraftsman) for his relentless work on keeping the themes site in pristine condition.

Many have also been busy writing and fixing the documentation in [hugoDocs](https://github.com/gohugoio/hugoDocs),
which has received **20 contributions by 10 contributors**. A special thanks to [@&#8203;salim-b](https://github.com/salim-b), [@&#8203;bep](https://github.com/bep), [@&#8203;thomasjsn](https://github.com/thomasjsn), and [@&#8203;lucasew](https://github.com/lucasew) for their work on the documentation site.

Hugo now has:

-   52487+ [stars](https://github.com/gohugoio/hugo/stargazers)
-   432+ [contributors](https://github.com/gohugoio/hugo/graphs/contributors)
-   370+ [themes](http://themes.gohugo.io/)

#### Notes

-   We now do deep merging of `params` from theme config(s). That is you most likely what you want, but [Merge Configuration from Themes](https://gohugo.io/getting-started/configuration/#merge-configuration-from-themes) describes how you can get the old behaviour back.

#### Enhancements

##### Templates

-   Rename err-missing-instagram-accesstoken => error-missing-instagram-accesstoken [9096842b](9096842b04) [@&#8203;bep](https://github.com/bep)
-   Add a terse pagination template variant to improve performance [73483d0f](73483d0f9e) [@&#8203;jmooring](https://github.com/jmooring) [#&#8203;8599](https://github.com/gohugoio/hugo/issues/8599)
-   Add erroridf template func [f55d2f43](f55d2f4376) [@&#8203;bep](https://github.com/bep) [#&#8203;8613](https://github.com/gohugoio/hugo/issues/8613)
-   Print response body on HTTP errors [282f1aa3](282f1aa3db) [@&#8203;bep](https://github.com/bep)
-   Misc header improvements, tests, allow multiple headers of same key [fcd63de3](fcd63de3a5) [@&#8203;bep](https://github.com/bep) [#&#8203;5617](https://github.com/gohugoio/hugo/issues/5617)
-   Allows user-defined HTTP headers with getJSON and getCSV [150d7573](150d75738b) [@&#8203;chamberlainpj](https://github.com/chamberlainpj) [#&#8203;5617](https://github.com/gohugoio/hugo/issues/5617)
-   Allow 'Querify' to take lone slice/interface argument [c46fc838](c46fc838a9) [@&#8203;importhuman](https://github.com/importhuman) [#&#8203;6735](https://github.com/gohugoio/hugo/issues/6735)

##### Output

-   Make WebAppManifestFormat NotAlternative=true [643b6719](643b671931) [@&#8203;bep](https://github.com/bep) [#&#8203;8624](https://github.com/gohugoio/hugo/issues/8624)
-   Adjust  test assertion [ab4e1dfa](ab4e1dfa4e) [@&#8203;bep](https://github.com/bep) [#&#8203;8625](https://github.com/gohugoio/hugo/issues/8625)
-   support application/manifest+json [02f31897](02f31897b4) [@&#8203;Seirdy](https://github.com/Seirdy) [#&#8203;8624](https://github.com/gohugoio/hugo/issues/8624)

##### Other

-   Regenerate docs helper [be6b901c](be6b901cf7) [@&#8203;bep](https://github.com/bep)
-   Regenerate docshelper [402da3f8](402da3f8f3) [@&#8203;bep](https://github.com/bep)
-   Implement configuration in a directory for modules [bb2aa087](bb2aa08709) [@&#8203;bep](https://github.com/bep) [#&#8203;8654](https://github.com/gohugoio/hugo/issues/8654)
-   Update github.com/alecthomas/chroma v0.9.1 => v0.9.2 [3aa7f0b2](3aa7f0b27f) [@&#8203;bep](https://github.com/bep) [#&#8203;8658](https://github.com/gohugoio/hugo/issues/8658)
-   Run go mod tidy [9b870aa7](9b870aa788) [@&#8203;bep](https://github.com/bep)
-   Split out the puthe path/filepath functions into common/paths [93aad3c5](93aad3c543) [@&#8203;bep](https://github.com/bep) [#&#8203;8654](https://github.com/gohugoio/hugo/issues/8654)
-   Update to Goldmark v1.3.8 [8eafe084](8eafe0845d) [@&#8203;jmooring](https://github.com/jmooring) [#&#8203;8648](https://github.com/gohugoio/hugo/issues/8648)
-   Do not read config from os.Environ when running tests [31fb29fb](31fb29fb3f) [@&#8203;bep](https://github.com/bep) [#&#8203;8655](https://github.com/gohugoio/hugo/issues/8655)
-   Set a dummy Instagram token [a886dd53](a886dd53b8) [@&#8203;bep](https://github.com/bep)
-   Regenerate docs helper [a91cd765](a91cd7652f) [@&#8203;bep](https://github.com/bep)
-   Update to Go 1.16.5, Goreleaser 0.169.0 [552cef5c](552cef5c57) [@&#8203;bep](https://github.com/bep) [#&#8203;8619](https://github.com/gohugoio/hugo/issues/8619)[#&#8203;8263](https://github.com/gohugoio/hugo/issues/8263)
-   Upgrade Instagram shortcode [9b5debe4](9b5debe4b8) [@&#8203;bep](https://github.com/bep) [#&#8203;7879](https://github.com/gohugoio/hugo/issues/7879)
-   Set modTime at creation time [06d29542](06d295427f) [@&#8203;bep](https://github.com/bep) [#&#8203;6161](https://github.com/gohugoio/hugo/issues/6161)
-   Add math.Max and math.Min [01758f99](01758f99b9) [@&#8203;jmooring](https://github.com/jmooring) [#&#8203;8583](https://github.com/gohugoio/hugo/issues/8583)
-   Catch incomplete shortcode error [845a7ba4](845a7ba4fc) [@&#8203;satotake](https://github.com/satotake) [#&#8203;6866](https://github.com/gohugoio/hugo/issues/6866)
-   Use SPDX license identifier [10f60de8](10f60de89a) [@&#8203;jmooring](https://github.com/jmooring) [#&#8203;8555](https://github.com/gohugoio/hugo/issues/8555)
-   Cache and copy Menu for sorting [785a31b5](785a31b5b8) [@&#8203;satotake](https://github.com/satotake) [#&#8203;7594](https://github.com/gohugoio/hugo/issues/7594)
-   Update to LibSASS 3.6.5 [bc1e0528](bc1e05286a) [@&#8203;bep](https://github.com/bep)
-   Make the HTML element collector more robust [f518b4f7](f518b4f71e) [@&#8203;bep](https://github.com/bep) [#&#8203;8530](https://github.com/gohugoio/hugo/issues/8530)
-   Make the HTML element collector more robust" [dc6b7a75](dc6b7a75ff) [@&#8203;bep](https://github.com/bep)
-   Get the collector in line with the io.Writer interface" [3f515f0e](3f515f0e33) [@&#8203;bep](https://github.com/bep)
-   Get the collector in line with the io.Writer interface [a9bcd381](a9bcd38181) [@&#8203;bep](https://github.com/bep)
-   Make the HTML element collector more robust [ef0f1a72](ef0f1a7269) [@&#8203;bep](https://github.com/bep) [#&#8203;8530](https://github.com/gohugoio/hugo/issues/8530)
-   Add Scratch.DeleteInMap [abbc99d4](abbc99d4c6) [@&#8203;meehawk](https://github.com/meehawk) [#&#8203;8504](https://github.com/gohugoio/hugo/issues/8504)
-   Display version when building site ([#&#8203;8533](https://github.com/gohugoio/hugo/issues/8533)) [76c95f55](76c95f55a5) [@&#8203;jmooring](https://github.com/jmooring) [#&#8203;8531](https://github.com/gohugoio/hugo/issues/8531)
-   Update querify function description and examples [2c7f5b62](2c7f5b62f6) [@&#8203;jmooring](https://github.com/jmooring)
-   Change SetEscapeHTML to false [504c78da](504c78da4b) [@&#8203;peaceiris](https://github.com/peaceiris) [#&#8203;8512](https://github.com/gohugoio/hugo/issues/8512)
-   Add a benchmark [b660ea8d](b660ea8d54) [@&#8203;bep](https://github.com/bep)
-   Update dependency list [64f88f30](64f88f3011) [@&#8203;bep](https://github.com/bep)

#### Fixes

##### Templates

-   Fix countwords to handle special chars [7a2c10ae](7a2c10ae60) [@&#8203;ResamVi](https://github.com/ResamVi) [#&#8203;8479](https://github.com/gohugoio/hugo/issues/8479)

##### Other

-   Fix fill with smartcrop sometimes returning 0 bytes images [5af045eb](5af045ebab) [@&#8203;bep](https://github.com/bep) [#&#8203;7955](https://github.com/gohugoio/hugo/issues/7955)
-   Misc config loading fixes [d392893c](d392893cd7) [@&#8203;bep](https://github.com/bep) [#&#8203;8633](https://github.com/gohugoio/hugo/issues/8633)[#&#8203;8618](https://github.com/gohugoio/hugo/issues/8618)[#&#8203;8630](https://github.com/gohugoio/hugo/issues/8630)[#&#8203;8591](https://github.com/gohugoio/hugo/issues/8591)[#&#8203;6680](https://github.com/gohugoio/hugo/issues/6680)[#&#8203;5192](https://github.com/gohugoio/hugo/issues/5192)
-   Fix nested OS env config override when parent does not exist [12530519](12530519d8) [@&#8203;bep](https://github.com/bep) [#&#8203;8618](https://github.com/gohugoio/hugo/issues/8618)
-   Fix invalid timestamp of the "public" folder [26ae12c0](26ae12c0c6) [@&#8203;anthonyfok](https://github.com/anthonyfok) [#&#8203;6161](https://github.com/gohugoio/hugo/issues/6161)
-   Fix env split to allow = character in  values [ee733085](ee733085b7) [@&#8203;xqbumu](https://github.com/xqbumu) [#&#8203;8589](https://github.com/gohugoio/hugo/issues/8589)
-   Fix warning regression in i18n [ececd1b1](ececd1b122) [@&#8203;bep](https://github.com/bep) [#&#8203;8492](https://github.com/gohugoio/hugo/issues/8492)

</details>

---

### Configuration

📅 **Schedule**: At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box.

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).

Reviewed-on: docker/hugo#5
Co-authored-by: Renovator Bot <renovator@rknet.org>
Co-committed-by: Renovator Bot <renovator@rknet.org>
2021-06-18 22:02:53 +02:00
Renovator Bot 5a2451ca91 chore(deps): update thegeeklab/alpine:latest docker digest
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
2021-05-10 22:01:10 +00:00
Renovator Bot 5f1fca9675 chore(deps): update thegeeklab/alpine:latest docker digest to 525dc4a
continuous-integration/drone/pr Build is passing Details
continuous-integration/drone/push Build is passing Details
2021-05-09 21:01:18 +00:00
Robert Kaussow ff6421bcb6
fix pipeline deps
continuous-integration/drone/push Build is passing Details
2021-05-09 22:57:24 +02:00
Robert Kaussow b954ce51ec
chore: improve generated changelog
continuous-integration/drone/push Build encountered an error Details
2021-05-09 22:42:33 +02:00
4 changed files with 20 additions and 8 deletions

View File

@ -6,10 +6,14 @@
{{ range .CommitGroups -}}
### {{ .Title }}
{{ $subjects := list }}
{{ range .Commits -}}
{{ if not (has .Subject $subjects) -}}
- {{ if .Scope }}**{{ .Scope }}:** {{ end }}{{ .Subject }}
{{ $subjects = append $subjects .Subject -}}
{{ end }}
{{ end -}}
{{- end }}
{{- end -}}
{{- if .NoteGroups -}}
{{ range .NoteGroups -}}

View File

@ -55,15 +55,22 @@ steps:
depends_on:
- dryrun
- name: changelog
- name: changelog-generate
image: thegeeklab/git-chglog
commands:
- git fetch -tq
- git-chglog --no-color --no-emoji ${DRONE_TAG:---next-tag unreleased unreleased}
- git-chglog --no-color --no-emoji -o CHANGELOG.md ${DRONE_TAG:---next-tag unreleased unreleased}
depends_on:
- tags
- name: changelog-format
image: thegeeklab/alpine-tools
commands:
- prettier CHANGELOG.md
- prettier -w CHANGELOG.md
depends_on:
- changelog-generate
- name: publish-dockerhub
image: thegeeklab/drone-docker-buildx:20
settings:
@ -78,7 +85,7 @@ steps:
- refs/heads/main
- refs/tags/**
depends_on:
- changelog
- changelog-format
- name: publish-quay
image: thegeeklab/drone-docker-buildx:20
@ -95,7 +102,7 @@ steps:
- refs/heads/main
- refs/tags/**
depends_on:
- changelog
- changelog-format
- name: publish-gitea
image: plugins/gitea-release
@ -188,6 +195,6 @@ depends_on:
---
kind: signature
hmac: 54adfa120f98b9554b345128101ae4c8725bddb13a735fb879c748ec6fb482b4
hmac: a1f7400028453cb7a43a23cc25eaae9e6b1eb972eb83153b6d37dc09b8b6d00b
...

View File

@ -1 +1,2 @@
.drone.yml
*.tpl.md

View File

@ -1,4 +1,4 @@
FROM thegeeklab/alpine:latest@sha256:1d985a44c907f1dafaeaeb40f52b569c8f52877491fe12f9262084d1875b91d4
FROM thegeeklab/alpine:latest@sha256:3de659c1a479d9d80e9c3924227981450af3a068087545a47360cfc2e70a91cc
LABEL maintainer="Robert Kaussow <mail@thegeeklab.de>"
LABEL org.opencontainers.image.authors="Robert Kaussow <mail@thegeeklab.de>"
@ -10,7 +10,7 @@ LABEL org.opencontainers.image.documentation="https://gitea.rknet.org/docker/hug
ARG BUILD_VERSION
# renovate: datasource=github-releases depName=gohugoio/hugo
ENV HUGO_VERSION="${BUILD_VERSION:-v0.83.1}"
ENV HUGO_VERSION="${BUILD_VERSION:-v0.84.0}"
ENV HUGO_ENV=production