Update to latest Go (#1517)

illicitonion · web-flow · commit e6facc2ed1b0 · 2025-07-23T15:12:21.000+01:00
Also check they're consistent
diff --git a/.github/workflows/build-all-sites.yml b/.github/workflows/build-all-sites.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.24.5
       - name: Setup Hugo
         uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f
         with:
diff --git a/.github/workflows/check-consistency.yml b/.github/workflows/check-consistency.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.24.5
       - name: Build tooling
         run: (cd tooling/go && go build ./cmd/local-overrides-enforcer && go build ./cmd/sprint-consistency && go build ./cmd/site-consistency)
       - name: Check override consistency
diff --git a/.github/workflows/test-tooling.yml b/.github/workflows/test-tooling.yml
@@ -12,6 +12,6 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.24.5
       - name: Run tooling tests
         run: cd tooling/go && go test ./...
diff --git a/common-content/go.mod b/common-content/go.mod
@@ -1,3 +1,3 @@
 module github.com/CodeYourFuture/curriculum/common-content
 
-go 1.21.3
+go 1.24.5
diff --git a/common-docs/go.mod b/common-docs/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/common-docs
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 // indirect
diff --git a/common-theme/go.mod b/common-theme/go.mod
@@ -1,3 +1,3 @@
 module github.com/CodeYourFuture/curriculum/common-theme
 
-go 1.21.3
+go 1.24.5
diff --git a/org-cyf-guides/go.mod b/org-cyf-guides/go.mod
@@ -1,10 +1,10 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-guides
 
-go 1.22.6
+go 1.24.5
 
 require (
-	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240818070728-e8702788f7cb // indirect
-	github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240818070728-e8702788f7cb // indirect
+	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
+	github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241008095008-281a5517463f // indirect
 	github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20240818070728-e8702788f7cb // indirect
 )
 
diff --git a/org-cyf-how-this-works/go.mod b/org-cyf-how-this-works/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-how-this-works
 
-go 1.22.6
+go 1.24.5
 
 toolchain go1.22.8
 
diff --git a/org-cyf-itd/go.mod b/org-cyf-itd/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-itd
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/org-cyf-itp/go.mod b/org-cyf-itp/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-itp
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240905150045-7be086ff6886 // indirect
diff --git a/org-cyf-launch/go.mod b/org-cyf-launch/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-launch
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 // indirect
diff --git a/org-cyf-piscine/go.mod b/org-cyf-piscine/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-piscine
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/org-cyf-sdc/go.mod b/org-cyf-sdc/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-sdc
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.0 // indirect
diff --git a/org-cyf-theme/go.mod b/org-cyf-theme/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-theme
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/org-cyf-tracks/go.mod b/org-cyf-tracks/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-tracks
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240905150045-7be086ff6886 // indirect
diff --git a/org-cyf/go.mod b/org-cyf/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/tooling/common-config/netlify.toml b/tooling/common-config/netlify.toml
@@ -4,7 +4,7 @@ publish = "public"
 command = "./deploy-netlify.sh"
 
 [build.environment]
-  GO_VERSION = "1.21.3"
+  GO_VERSION = "1.24.5"
   HUGO_VERSION = "0.136.3"
   NODE_VERSION = "20"
   NPM_FLAGS = "--legacy-peer-deps"
diff --git a/tooling/go/cmd/site-consistency/main.go b/tooling/go/cmd/site-consistency/main.go
@@ -9,18 +9,47 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+
+	"github.com/BurntSushi/toml"
+	"github.com/goccy/go-yaml"
+	"golang.org/x/mod/modfile"
 )
 
 func main() {
 	var rootDirectory string
 	flag.StringVar(&rootDirectory, "root-dir", ".", "Root directory to search for hugo.toml files in")
 	flag.Parse()
 
+	var errors []string
+
+	netlifyGoVersion, err := getNetlifyGoVersion(filepath.Join(rootDirectory, "tooling", "common-config", "netlify.toml"))
+	if err != nil {
+		log.Fatalf("Failed to get netlify Go version: %v", err)
+	}
+
+	githubActionsPaths, err := os.ReadDir(filepath.Join(rootDirectory, ".github", "workflows"))
+	if err != nil {
+		log.Fatalf("Failed to list github actions: %v", err)
+	}
+	for _, githubActionsDirent := range githubActionsPaths {
+		path := filepath.Join(rootDirectory, ".github", "workflows", githubActionsDirent.Name())
+		githubActionsGoVersion, err := getGithubActionsGoVersion(path)
+		if err != nil {
+			log.Fatalf("Failed to get github actions Go version for path %s: %v", path, err)
+		}
+		if githubActionsGoVersion != "" && netlifyGoVersion != githubActionsGoVersion {
+			errors = append(errors, fmt.Sprintf("Inconsistent Go versions - netlify: %s, github actions in %s: %s", netlifyGoVersion, path, githubActionsGoVersion))
+		}
+	}
+
 	var directoriesToCheck []string
-	err := filepath.WalkDir(rootDirectory, func(path string, d fs.DirEntry, err error) error {
+	err = filepath.WalkDir(rootDirectory, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
+		if d.Name() == "_vendor" {
+			return fs.SkipDir
+		}
 
 		if d.Name() == "hugo.toml" {
 			directoriesToCheck = append(directoriesToCheck, filepath.Dir(path))
@@ -32,13 +61,27 @@ func main() {
 	}
 
 	sort.Strings(directoriesToCheck)
-	var errors []string
 	for _, directoryToCheck := range directoriesToCheck {
 		for _, expectedSymlink := range []string{"config", "deploy-netlify.sh", "netlify.toml"} {
 			if errorToReport, ok := checkForParentSymlink(directoryToCheck, expectedSymlink); !ok {
 				errors = append(errors, errorToReport)
 			}
 		}
+		gomodPath := filepath.Join(directoryToCheck, "go.mod")
+		gomodContents, err := os.ReadFile(gomodPath)
+		if err != nil {
+			errors = append(errors, fmt.Sprintf("Failed to read go.mod file at %s: %v", gomodPath, err))
+			continue
+		}
+		gomodFile, err := modfile.Parse(gomodPath, gomodContents, nil)
+		if err != nil {
+			errors = append(errors, fmt.Sprintf("Failed to parse go.mod file at %s: %v", gomodPath, err))
+			continue
+		}
+		if gomodFile.Go.Version != netlifyGoVersion {
+			errors = append(errors, fmt.Sprintf("Inconsistent Go versions - netlify: %s, %s: %s", netlifyGoVersion, gomodPath, gomodFile.Go.Version))
+			continue
+		}
 	}
 
 	for _, errorToReport := range errors {
@@ -78,3 +121,55 @@ func checkForParentSymlink(directoryToCheck, expectedLinkName string) (string, b
 func formatError(path, expectedDestination, reason string) string {
 	return fmt.Sprintf("Expected %s to be a symlink pointing at %s but %s", path, expectedDestination, reason)
 }
+
+func getNetlifyGoVersion(path string) (string, error) {
+	bytes, err := os.ReadFile(path)
+	if err != nil {
+		return "", fmt.Errorf("failed to read netlify config file: %w", err)
+	}
+	var config netlifyConfig
+	if err := toml.Unmarshal(bytes, &config); err != nil {
+		return "", fmt.Errorf("failed to decode netlify config file: %w", err)
+	}
+	return config.Build.Environment["GO_VERSION"], nil
+}
+
+type netlifyConfig struct {
+	Build netlifyBuildConfig
+}
+
+type netlifyBuildConfig struct {
+	Environment map[string]string
+}
+
+func getGithubActionsGoVersion(path string) (string, error) {
+	bytes, err := os.ReadFile(path)
+	if err != nil {
+		return "", fmt.Errorf("failed to read github actions config file: %w", err)
+	}
+	var config githubActionsConfig
+	if err := yaml.Unmarshal(bytes, &config); err != nil {
+		return "", fmt.Errorf("failed to decode github actions config file: %w", err)
+	}
+	for _, job := range config.Jobs {
+		for _, step := range job.Steps {
+			if step.Name == "Setup Go" {
+				return step.With["go-version"], nil
+			}
+		}
+	}
+	return "", nil
+}
+
+type githubActionsConfig struct {
+	Jobs map[string]githubActionsJobConfig
+}
+
+type githubActionsJobConfig struct {
+	Steps []githubActionStepConfig
+}
+
+type githubActionStepConfig struct {
+	Name string
+	With map[string]string
+}
diff --git a/tooling/go/go.mod b/tooling/go/go.mod
@@ -1,16 +1,17 @@
 module github.com/CodeYourFuture/curriculum/tooling/go
 
-go 1.21.5
+go 1.24.5
 
 require (
 	github.com/stretchr/testify v1.8.4
 	golang.org/x/mod v0.14.0
 )
 
 require (
-	github.com/BurntSushi/toml v0.3.1 // indirect
+	github.com/BurntSushi/toml v1.5.0 // indirect
 	github.com/adrg/frontmatter v0.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/goccy/go-yaml v1.18.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v2 v2.3.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
diff --git a/tooling/go/go.sum b/tooling/go/go.sum
@@ -1,9 +1,13 @@
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
 github.com/adrg/frontmatter v0.2.0 h1:/DgnNe82o03riBd1S+ZDjd43wAmC6W35q67NHeLkPd4=
 github.com/adrg/frontmatter v0.2.0/go.mod h1:93rQCj3z3ZlwyxxpQioRKC1wDLto4aXHrbqIsnH9wmE=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw=
+github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`module github.com/CodeYourFuture/curriculum/common-content`
`2`	`2`
`3`		`-go 1.21.3`
	`3`	`+go 1.24.5`