Upgrade to Go 1.23

Fixes #12763

Author: bep

.circleci/config.yml

@@ -4,7 +4,7 @@ parameters:
 defaults: &defaults
   resource_class: large
   docker:
-      - image: bepsays/ci-hugoreleaser:1.22200.20501
+      - image: bepsays/ci-hugoreleaser:1.22300.20000
 environment: &buildenv
       GOMODCACHE: /root/project/gomodcache
 version: 2
@@ -60,7 +60,7 @@ jobs:
     environment:
         <<: [*buildenv]
     docker:
-    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22200.20501
+    - image: bepsays/ci-hugoreleaser-linux-arm64:1.22300.20000
     steps:
       - *restore-cache
       - &attach-workspace

.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.21.x, 1.22.x]
+        go-version: [1.22.x, 1.23.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:

go.mod

@@ -170,4 +170,4 @@ require (
 	software.sslmate.com/src/go-pkcs12 v0.2.0 // indirect
 )
 
-go 1.21.8
+go 1.22.6

hugofs/fs.go

@@ -147,7 +147,8 @@ func isWrite(flag int) bool {
 // TODO(bep) move this to a more suitable place.
 func MakeReadableAndRemoveAllModulePkgDir(fs afero.Fs, dir string) (int, error) {
 	// Safe guard
-	if !strings.Contains(dir, "pkg") {
+	// Note that the base directory changed from pkg to gomod_cache in Go 1.23.
+	if !strings.Contains(dir, "pkg") && !strings.Contains(dir, "gomod") {
 		panic(fmt.Sprint("invalid dir:", dir))
 	}
 

modules/client.go

@@ -365,18 +365,6 @@ func (c *Client) Get(args ...string) error {
 }
 
 func (c *Client) get(args ...string) error {
-	var hasD bool
-	for _, arg := range args {
-		if arg == "-d" {
-			hasD = true
-			break
-		}
-	}
-	if !hasD {
-		// go get without the -d flag does not make sense to us, as
-		// it will try to build and install go packages.
-		args = append([]string{"-d"}, args...)
-	}
 	if err := c.runGo(context.Background(), c.logger.Out(), append([]string{"get"}, args...)...); err != nil {
 		return fmt.Errorf("failed to get %q: %w", args, err)
 	}

scripts/fork_go_templates/main.go

@@ -16,7 +16,7 @@ import (
 )
 
 func main() {
-	// The current is built with 8e1fdea8316d840fd07e9d6e026048e53290948b go1.22.5
+	// The current is built with  6885bad7dd86880be6929c02085e5c7a67ff2887 go1.23.0
 	// TODO(bep) preserve the staticcheck.conf file.
 	fmt.Println("Forking ...")
 	defer fmt.Println("Done ...")

testscripts/commands/mod.txt

@@ -18,7 +18,8 @@ hugo mod clean
 ! stderr .
 stdout 'hugo: removed 1 dirs in module cache for \"github.com/bep/empty-hugo-module\"'
 hugo mod clean --all
-stdout 'Deleted 2\d{2} files from module cache\.'
+# Currently this is 299 on MacOS and 301 on Linux.
+stdout 'Deleted (2|3)\d{2} files from module cache\.'
 cd submod
 hugo mod init testsubmod
 cmpenv go.mod $WORK/golden/go.mod.testsubmod

testscripts/commands/mod_npm.txt

@@ -2,6 +2,7 @@
 
 dostounix golden/package.json
 
+
 hugo mod npm pack
 cmp package.json golden/package.json
 
@@ -41,3 +42,4 @@ path="github.com/gohugoio/hugoTestModule2"
 }
 -- go.mod --
 module github.com/gohugoio/hugoTestModule
+go 1.20

testscripts/commands/mod_npm_withexisting.txt

@@ -55,3 +55,4 @@ path="github.com/gohugoio/hugoTestModule2"
 }
 -- go.mod --
 module github.com/gohugoio/hugoTestModule
+go 1.20

tpl/internal/go_templates/cfg/cfg.go

@@ -36,6 +36,7 @@ const KnownEnv = `
 	GOAMD64
 	GOARCH
 	GOARM
+	GOARM64
 	GOBIN
 	GOCACHE
 	GOCACHEPROG
@@ -57,6 +58,7 @@ const KnownEnv = `
 	GOPPC64
 	GOPRIVATE
 	GOPROXY
+	GORISCV64
 	GOROOT
 	GOSUMDB
 	GOTMPDIR