Upgrade to Go 1.26
@@ -4,7 +4,7 @@ parameters:
|
|||||||
defaults: &defaults
|
defaults: &defaults
|
||||||
resource_class: large
|
resource_class: large
|
||||||
docker:
|
docker:
|
||||||
- image: bepsays/ci-hugoreleaser:1.22500.20400
|
- image: bepsays/ci-hugoreleaser:1.22600.20000
|
||||||
environment: &buildenv
|
environment: &buildenv
|
||||||
GOMODCACHE: /root/project/gomodcache
|
GOMODCACHE: /root/project/gomodcache
|
||||||
version: 2
|
version: 2
|
||||||
@@ -58,7 +58,7 @@ jobs:
|
|||||||
environment:
|
environment:
|
||||||
<<: [*buildenv]
|
<<: [*buildenv]
|
||||||
docker:
|
docker:
|
||||||
- image: bepsays/ci-hugoreleaser-linux-arm64:1.22500.20400
|
- image: bepsays/ci-hugoreleaser-linux-arm64:1.22600.20000
|
||||||
steps:
|
steps:
|
||||||
- *restore-cache
|
- *restore-cache
|
||||||
- &attach-workspace
|
- &attach-workspace
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ jobs:
|
|||||||
test:
|
test:
|
||||||
strategy:
|
strategy:
|
||||||
matrix:
|
matrix:
|
||||||
go-version: [1.24.x, 1.25.x]
|
go-version: [1.25.x, 1.26.x]
|
||||||
os: [ubuntu-latest, windows-latest] # macos disabled for now because of disk space issues.
|
os: [ubuntu-latest, windows-latest] # macos disabled for now because of disk space issues.
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
# Twitter: https://twitter.com/gohugoio
|
# Twitter: https://twitter.com/gohugoio
|
||||||
# Website: https://gohugo.io/
|
# Website: https://gohugo.io/
|
||||||
|
|
||||||
ARG GO_VERSION="1.25"
|
ARG GO_VERSION="1.26"
|
||||||
ARG ALPINE_VERSION="3.22"
|
ARG ALPINE_VERSION="3.22"
|
||||||
ARG DART_SASS_VERSION="1.79.3"
|
ARG DART_SASS_VERSION="1.79.3"
|
||||||
|
|
||||||
|
|||||||
@@ -463,7 +463,7 @@ func (c *importCommand) importFromJekyll(args []string) error {
|
|||||||
}
|
}
|
||||||
|
|
||||||
c.r.Println("Congratulations!", fileCount, "post(s) imported!")
|
c.r.Println("Congratulations!", fileCount, "post(s) imported!")
|
||||||
c.r.Println("Now, start Hugo by yourself:\n")
|
c.r.Println("Now, start Hugo by yourself:")
|
||||||
c.r.Println("cd " + args[1])
|
c.r.Println("cd " + args[1])
|
||||||
c.r.Println("git init")
|
c.r.Println("git init")
|
||||||
c.r.Println("git submodule add https://github.com/theNewDynamic/gohugo-theme-ananke themes/ananke")
|
c.r.Println("git submodule add https://github.com/theNewDynamic/gohugo-theme-ananke themes/ananke")
|
||||||
|
|||||||
@@ -193,4 +193,4 @@ require (
|
|||||||
software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect
|
software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect
|
||||||
)
|
)
|
||||||
|
|
||||||
go 1.24.0
|
go 1.25.0
|
||||||
|
|||||||
@@ -461,7 +461,14 @@ func testSetupFunc() func(env *testscript.Env) error {
|
|||||||
goVersion = goVersion[:strings.LastIndex(goVersion, ".")]
|
goVersion = goVersion[:strings.LastIndex(goVersion, ".")]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
goModVersion := goVersion
|
||||||
|
// From Go 1.26.0 on, the version used in go.mod on go mod init is the current version minus one.
|
||||||
|
if htesting.GoMinorVersion() >= 26 {
|
||||||
|
goModVersion = "1.25.0"
|
||||||
|
}
|
||||||
|
|
||||||
keyVals = append(keyVals, "GOVERSION", goVersion)
|
keyVals = append(keyVals, "GOVERSION", goVersion)
|
||||||
|
keyVals = append(keyVals, "GOMODVERSION", goModVersion)
|
||||||
envhelpers.SetEnvVars(&env.Vars, keyVals...)
|
envhelpers.SetEnvVars(&env.Vars, keyVals...)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ package images_test
|
|||||||
import (
|
import (
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
|
"github.com/gohugoio/hugo/htesting"
|
||||||
"github.com/gohugoio/hugo/hugolib"
|
"github.com/gohugoio/hugo/hugolib"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -52,6 +53,10 @@ Orientation: {{ $orientation }}|eq 6: {{ eq $orientation 6 }}|Type: {{ printf "%
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestColorsIssue14453(t *testing.T) {
|
func TestColorsIssue14453(t *testing.T) {
|
||||||
|
// Go changed their JPEG implementation in Go 1.26, so we cannot run this test on earlier versions. See https://go.dev/doc/go1.26#imagejpegpkgimagejpeg
|
||||||
|
if htesting.GoMinorVersion() < 26 {
|
||||||
|
t.Skip("Go 1.26+ required")
|
||||||
|
}
|
||||||
files := `
|
files := `
|
||||||
-- hugo.toml --
|
-- hugo.toml --
|
||||||
-- assets/sunset.jpg --
|
-- assets/sunset.jpg --
|
||||||
@@ -69,7 +74,7 @@ Colors: {{ $colors }}|
|
|||||||
cfg.NeedsOsFS = true
|
cfg.NeedsOsFS = true
|
||||||
cfg.WorkingDir = tempDir
|
cfg.WorkingDir = tempDir
|
||||||
}))
|
}))
|
||||||
b.AssertFileContent("public/index.html", "Colors: [#2e2f34 #a39e94 #d39e57 #a96b3a #747b84 #7c838a]|")
|
b.AssertFileContent("public/index.html", "Colors: [#2e2f34 #a39e94 #d29e58 #ab6b3a #747b84 #7c838a]|")
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -236,7 +236,8 @@ func goldenEqual(img1, img2 *image.NRGBA) bool {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// We don't have a CI test environment for these, and there are known dithering issues that makes these time consuming to maintain.
|
// We don't have a CI test environment for these, and there are known dithering issues that makes these time consuming to maintain.
|
||||||
var SkipGoldenTests = runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le" || runtime.GOARCH == "s390x"
|
// Go changed their JPEG implementation in Go 1.26, so we cannot run the golden tests on earlier versions. See https://go.dev/doc/go1.26#imagejpegpkgimagejpeg
|
||||||
|
var SkipGoldenTests = htesting.GoMinorVersion() < 26 || runtime.GOARCH == "ppc64" || runtime.GOARCH == "ppc64le" || runtime.GOARCH == "s390x"
|
||||||
|
|
||||||
// UsesFMA indicates whether "fused multiply and add" (FMA) instruction is
|
// UsesFMA indicates whether "fused multiply and add" (FMA) instruction is
|
||||||
// used. The command "grep FMADD go/test/codegen/floats.go" can help keep
|
// used. The command "grep FMADD go/test/codegen/floats.go" can help keep
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 7.7 KiB After Width: | Height: | Size: 7.7 KiB |
|
Before Width: | Height: | Size: 147 KiB After Width: | Height: | Size: 147 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 8.6 KiB After Width: | Height: | Size: 8.6 KiB |
|
Before Width: | Height: | Size: 6.0 KiB After Width: | Height: | Size: 6.0 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 13 KiB |
|
Before Width: | Height: | Size: 7.4 KiB After Width: | Height: | Size: 7.4 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 6.6 KiB After Width: | Height: | Size: 6.6 KiB |
|
Before Width: | Height: | Size: 9.9 KiB After Width: | Height: | Size: 9.9 KiB |
|
Before Width: | Height: | Size: 9.8 KiB After Width: | Height: | Size: 9.8 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 9.5 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 63 KiB After Width: | Height: | Size: 63 KiB |
|
Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB |
|
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 43 KiB |
|
Before Width: | Height: | Size: 44 KiB After Width: | Height: | Size: 44 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 7.2 KiB After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 8.4 KiB After Width: | Height: | Size: 8.4 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 1.6 KiB |
|
Before Width: | Height: | Size: 2.8 KiB After Width: | Height: | Size: 2.8 KiB |
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
|
Before Width: | Height: | Size: 4.8 KiB After Width: | Height: | Size: 4.8 KiB |
|
Before Width: | Height: | Size: 5.3 KiB After Width: | Height: | Size: 5.3 KiB |
|
Before Width: | Height: | Size: 8.0 KiB After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 8.3 KiB |
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 5.5 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 3.3 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.3 KiB |
|
Before Width: | Height: | Size: 3.4 KiB After Width: | Height: | Size: 3.4 KiB |
|
Before Width: | Height: | Size: 59 KiB After Width: | Height: | Size: 59 KiB |
|
Before Width: | Height: | Size: 766 B After Width: | Height: | Size: 766 B |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 2.4 KiB |
|
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 3.2 KiB |
@@ -46,4 +46,4 @@ title = "Hugo Sub Module"
|
|||||||
-- golden/go.mod.testsubmod --
|
-- golden/go.mod.testsubmod --
|
||||||
module testsubmod
|
module testsubmod
|
||||||
|
|
||||||
go ${GOVERSION}
|
go ${GOMODVERSION}
|
||||||
|
|||||||
@@ -12,4 +12,4 @@ path="github.com/bep/empty-hugo-module"
|
|||||||
-- golden/go.mod.testsubmod --
|
-- golden/go.mod.testsubmod --
|
||||||
module testsubmod
|
module testsubmod
|
||||||
|
|
||||||
go ${GOVERSION}
|
go ${GOMODVERSION}
|
||||||