From 09ac73338198ceb143c1e5edc5859ab735cd80bb Mon Sep 17 00:00:00 2001 From: Khayyam Saleem Date: Mon, 30 May 2022 09:12:41 -0400 Subject: [PATCH] common: Add hugo.GoVersion Closes #9849. This enables `hugo.GoVersion` in templates to access the version of Go that the Hugo binary was built with. --- common/hugo/hugo.go | 6 ++++++ common/hugo/hugo_test.go | 1 + docs/content/en/functions/hugo.md | 7 +++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common/hugo/hugo.go b/common/hugo/hugo.go index 2c6e5f2a0e3..d78564a67db 100644 --- a/common/hugo/hugo.go +++ b/common/hugo/hugo.go @@ -53,6 +53,9 @@ type Info struct { // It can be any string, but it will be all lower case. Environment string + // version of go that the Hugo binary was built with + GoVersion string + deps []*Dependency } @@ -87,12 +90,14 @@ func NewInfo(environment string, deps []*Dependency) Info { var ( commitHash string buildDate string + goVersion string ) bi := getBuildInfo() if bi != nil { commitHash = bi.Revision buildDate = bi.RevisionTime + goVersion = bi.GoVersion } return Info{ @@ -100,6 +105,7 @@ func NewInfo(environment string, deps []*Dependency) Info { BuildDate: buildDate, Environment: environment, deps: deps, + GoVersion: goVersion, } } diff --git a/common/hugo/hugo_test.go b/common/hugo/hugo_test.go index 3bc95684b8d..f2ad0f5c1ef 100644 --- a/common/hugo/hugo_test.go +++ b/common/hugo/hugo_test.go @@ -32,6 +32,7 @@ func TestHugoInfo(t *testing.T) { if bi != nil { c.Assert(hugoInfo.CommitHash, qt.Equals, bi.Revision) c.Assert(hugoInfo.BuildDate, qt.Equals, bi.RevisionTime) + c.Assert(hugoInfo.GoVersion, qt.Equals, bi.GoVersion) } c.Assert(hugoInfo.Environment, qt.Equals, "production") c.Assert(string(hugoInfo.Generator()), qt.Contains, fmt.Sprintf("Hugo %s", hugoInfo.Version())) diff --git a/docs/content/en/functions/hugo.md b/docs/content/en/functions/hugo.md index a495eae0ad5..1792f5a8d76 100644 --- a/docs/content/en/functions/hugo.md +++ b/docs/content/en/functions/hugo.md @@ -27,8 +27,8 @@ hugo.Generator hugo.Version : the current version of the Hugo binary you are using e.g. `0.63.2` - -`hugo` returns an instance that contains the following functions: +hugo.GoVersion +: returns the version of Go that the Hugo binary was built with. {{< new-in "0.101.0" >}} hugo.Environment : the current running environment as defined through the `--environment` cli tag @@ -52,7 +52,6 @@ We highly recommend using `hugo.Generator` in your website's ``. `hugo.Gen hugo.Deps : See [hugo.Deps](#hugodeps) - ## hugo.Deps {{< new-in "0.92.0" >}} @@ -112,4 +111,4 @@ An example table listing the dependencies: {{ end }} -``` \ No newline at end of file +```