go.mod, misc: update to go 1.24

Change-Id: Iba3d15376214048113314150944d3b0df187a8cf
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/656475
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
kokoro-CI: kokoro <noreply+kokoro@google.com>
Reviewed-by: Robert Findley <rfindley@google.com>

Author: jba

cmd/internal/pkgsite/server.go

@@ -14,7 +14,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"sort"
 	"strings"
 	"time"
@@ -243,7 +242,7 @@ func buildGetters(ctx context.Context, cfg getterConfig) ([]fetch.ModuleGetter,
 	if cfg.useLocalStdlib {
 		goRepo := cfg.goRepoPath
 		if goRepo == "" {
-			goRepo = getGOROOT()
+			goRepo = internal.GOROOT()
 		}
 		if goRepo != "" { // if goRepo == "" we didn't get a *goRepoPath and couldn't find GOROOT. Fall back to the zip files.
 			mg, err := fetch.NewGoPackagesStdlibModuleGetter(ctx, goRepo)
@@ -265,17 +264,6 @@ func buildGetters(ctx context.Context, cfg getterConfig) ([]fetch.ModuleGetter,
 	return getters, nil
 }
 
-func getGOROOT() string {
-	if rg := runtime.GOROOT(); rg != "" {
-		return rg
-	}
-	b, err := exec.Command("go", "env", "GOROOT").Output()
-	if err != nil {
-		return ""
-	}
-	return strings.TrimSpace(string(b))
-}
-
 func newServer(getters []fetch.ModuleGetter, localModules []frontend.LocalModule, prox *proxy.Client, devMode bool, staticFlag string) (*frontend.Server, error) {
 	lds := fetchdatasource.Options{
 		Getters:              getters,

deploy/deploy-env.yaml

@@ -22,7 +22,7 @@ steps:
     args:
       - $PROJECT_ID
   - id: Check redistributable
-    name: golang:1.23
+    name: golang:1.24
     entrypoint: private/devtools/check_redist.sh
   - id: Build
     name: gcr.io/cloud-builders/docker
@@ -48,7 +48,7 @@ steps:
       - -c
       - deploy/frontend.sh $_ENV gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
   - id: Pagecheck
-    name: golang:1.23
+    name: golang:1.24
     entrypoint: deploy/pagecheck.sh
     args:
       - $_ENV

deploy/deploy.yaml

@@ -22,7 +22,7 @@ steps:
     args:
       - $PROJECT_ID
   - id: Check redistributable
-    name: golang:1.23
+    name: golang:1.24
     entrypoint: private/devtools/check_redist.sh
   - id: Build
     name: gcr.io/cloud-builders/docker
@@ -48,7 +48,7 @@ steps:
       - -c
       - deploy/frontend.sh staging gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
   - id: Pagecheck - staging
-    name: golang:1.23
+    name: golang:1.24
     entrypoint:  deploy/pagecheck.sh
     args:
       - staging
@@ -77,7 +77,7 @@ steps:
       - -c
       - deploy/frontend.sh prod gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
   - id: Pagecheck - prod
-    name: golang:1.23
+    name: golang:1.24
     entrypoint:  deploy/pagecheck.sh
     args:
       - prod
@@ -88,7 +88,7 @@ steps:
       - -c
       - deploy/frontend.sh beta gcr.io/$PROJECT_ID/frontend:$(cat _BUILD_TAG)
   - id: Pagecheck - beta
-    name: golang:1.23
+    name: golang:1.24
     entrypoint:  deploy/pagecheck.sh
     args:
       - beta

deploy/migrate.yaml

@@ -16,7 +16,7 @@ steps:
     args:
       - $PROJECT_ID
   - id: Migrate
-    name: golang:1.23
+    name: golang:1.24
     entrypoint: bash
     dir: private
     args:

deploy/sitemap.yaml

@@ -9,7 +9,7 @@ steps:
     args:
       - $PROJECT_ID
   - id: Build
-    name: golang:1.23
+    name: golang:1.24
     entrypoint: bash
     dir: private
     args:

devtools/docker/compose.yaml

@@ -30,7 +30,7 @@ services:
     depends_on:
       - db
      # This should match the version we are using on Cloud Run.
-    image: golang:1.23
+    image: golang:1.24
     environment:
       <<: [*database-variables, *go-variables]
       GO_DISCOVERY_TESTDB: ${GO_DISCOVERY_TESTDB:-"true"}
@@ -41,7 +41,7 @@ services:
       - ../../:/pkgsite
     working_dir: /pkgsite
   searchtest:
-    image: golang:1.23
+    image: golang:1.24
     depends_on:
       - frontend
     environment:
@@ -52,7 +52,7 @@ services:
       - ../../:/pkgsite
     working_dir: /pkgsite
   api:
-    image: golang:1.23
+    image: golang:1.24
     depends_on:
       - frontend
     environment:
@@ -64,7 +64,7 @@ services:
     working_dir: /pkgsite
   frontend:
      # This should match the version we are using on AppEngine.
-    image: golang:1.23
+    image: golang:1.24
     depends_on:
       - db
     command: bash -c "
@@ -81,7 +81,7 @@ services:
     working_dir: /pkgsite
   seeddb:
      # This should match the version we are using on Cloud Run.
-    image: golang:1.23
+    image: golang:1.24
     depends_on:
       - db
     # Note: technically we should check that migrations have completed before
@@ -134,7 +134,7 @@ services:
     shm_size: 8G
   go:
      # This should match the version we are using on Cloud Run.
-    image: golang:1.23
+    image: golang:1.24
     entrypoint: go
     environment:
       <<: [*database-variables, *go-variables]

go.mod

@@ -1,6 +1,6 @@
 module golang.org/x/pkgsite
 
-go 1.23.0
+go 1.24.1
 
 require (
 	cloud.google.com/go/cloudtasks v1.10.0

internal/godoc/encode_test.go

@@ -14,15 +14,15 @@ import (
 	"io"
 	"path/filepath"
 	"reflect"
-	"runtime"
 	"sort"
 	"strings"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
+	"golang.org/x/pkgsite/internal"
 )
 
-var packageToTest string = filepath.Join(runtime.GOROOT(), "src", "net", "http")
+var packageToTest string = filepath.Join(internal.GOROOT(), "src", "net", "http")
 
 func TestEncodeDecodePackage(t *testing.T) {
 	p, err := packageForDir(packageToTest, true)

internal/symbol/apigodoc.go

@@ -16,12 +16,12 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"runtime"
 	"sort"
 	"strings"
 	"unicode"
 
 	"golang.org/x/mod/semver"
+	"golang.org/x/pkgsite/internal"
 	"golang.org/x/pkgsite/internal/derrors"
 	"golang.org/x/pkgsite/internal/stdlib"
 )
@@ -69,7 +69,7 @@ func ParsePackageAPIInfo(files []string) (_ apiVersions, err error) {
 func LoadAPIFiles(pkgPath, dir string) ([]string, error) {
 	var apiGlob string
 	if stdlib.Contains(pkgPath) {
-		apiGlob = filepath.Join(filepath.Clean(runtime.GOROOT()), "api", "go*.txt")
+		apiGlob = filepath.Join(filepath.Clean(internal.GOROOT()), "api", "go*.txt")
 	} else {
 		apiGlob = filepath.Join(dir, pkgPath, "v*.txt")
 	}

internal/symbol/generate.go

@@ -17,7 +17,6 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
-	"runtime"
 	"sort"
 	"strings"
 	"sync"
@@ -347,7 +346,7 @@ func (w *Walker) emitf(format string, args ...any) {
 // https://go.googlesource.com/go/+/refs/tags/go1.16.6/src/cmd/api/goapi.go#31,
 // except support for Windows is removed.
 func goCmd() string {
-	path := filepath.Join(runtime.GOROOT(), "bin", "go")
+	path := filepath.Join(internal.GOROOT(), "bin", "go")
 	if _, err := os.Stat(path); err == nil {
 		return path
 	}

internal/util.go

@@ -7,6 +7,7 @@ package internal
 import (
 	"bufio"
 	"os"
+	"os/exec"
 	"strings"
 
 	"golang.org/x/pkgsite/internal/derrors"
@@ -37,3 +38,14 @@ func ReadFileLines(filename string) (lines []string, err error) {
 	}
 	return lines, nil
 }
+
+// GOROOT returns the value of GOROOT.
+// It is similar to runtime.GOROOT but will work even if the binary is moved to
+// a different machine. (runtime.GOROOT is deprecated since 1.24 for that reason.)
+func GOROOT() string {
+	b, err := exec.Command("go", "env", "GOROOT").Output()
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(b))
+}