From 33b5c3c62e4504b915f1ee80d337d0ba77201bb8 Mon Sep 17 00:00:00 2001
From: Jakob Borg <jakob@kastelo.net>
Date: Sat, 16 Aug 2025 06:02:58 +0200
Subject: [PATCH] build: bump required language level to 1.24, compiler to 1.25
 (#10248)

(After 2.0.1)
---
 .github/workflows/build-infra-dockers.yaml | 2 +-
 .github/workflows/build-syncthing.yaml     | 4 ++--
 go.mod                                     | 2 +-
 lib/api/api_test.go                        | 2 +-
 lib/ignore/ignore_test.go                  | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build-infra-dockers.yaml b/.github/workflows/build-infra-dockers.yaml
index 160d1dcc9..357307195 100644
--- a/.github/workflows/build-infra-dockers.yaml
+++ b/.github/workflows/build-infra-dockers.yaml
@@ -7,7 +7,7 @@ on:
       - infra-*
 
 env:
-  GO_VERSION: "~1.24.0"
+  GO_VERSION: "~1.25.0"
   CGO_ENABLED: "0"
   BUILD_USER: docker
   BUILD_HOST: github.syncthing.net
diff --git a/.github/workflows/build-syncthing.yaml b/.github/workflows/build-syncthing.yaml
index e8d36e5f0..545a06cc7 100644
--- a/.github/workflows/build-syncthing.yaml
+++ b/.github/workflows/build-syncthing.yaml
@@ -13,7 +13,7 @@ env:
   # The go version to use for builds. We set check-latest to true when
   # installing, so we get the latest patch version that matches the
   # expression.
-  GO_VERSION: "~1.24.0"
+  GO_VERSION: "~1.25.0"
 
   # Optimize compatibility on the slow architectures.
   GOMIPS: softfloat
@@ -102,7 +102,7 @@ jobs:
         runner: ["windows-latest", "ubuntu-latest", "macos-latest"]
         # The oldest version in this list should match what we have in our go.mod.
         # Variables don't seem to be supported here, or we could have done something nice.
-        go: ["~1.23.0", "~1.24.0"]
+        go: ["~1.24.0", "~1.25.0"]
     runs-on: ${{ matrix.runner }}
     steps:
       - name: Set git to use LF
diff --git a/go.mod b/go.mod
index 32b778df8..7747c0659 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/syncthing/syncthing
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/AudriusButkevicius/recli v0.0.7
diff --git a/lib/api/api_test.go b/lib/api/api_test.go
index d6f0b67e4..65e5fed4c 100644
--- a/lib/api/api_test.go
+++ b/lib/api/api_test.go
@@ -888,7 +888,7 @@ func TestHtmlFormLogin(t *testing.T) {
 				t.Errorf("Unexpected non-200 return code %d at %s", resp.StatusCode, noAuthPath)
 			}
 			if hasSessionCookie(resp.Cookies()) {
-				t.Errorf("Unexpected session cookie at " + noAuthPath)
+				t.Errorf("Unexpected session cookie at %s", noAuthPath)
 			}
 		})
 	}
diff --git a/lib/ignore/ignore_test.go b/lib/ignore/ignore_test.go
index fc051ffe9..0232a8b6a 100644
--- a/lib/ignore/ignore_test.go
+++ b/lib/ignore/ignore_test.go
@@ -1080,7 +1080,7 @@ func TestIssue4901(t *testing.T) {
 
 	fd, err := pats.fs.Create(".stignore")
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err)
 	}
 	if _, err := fd.Write([]byte(stignore)); err != nil {
 		t.Fatal(err)
@@ -1102,7 +1102,7 @@ func TestIssue4901(t *testing.T) {
 
 	fd, err = pats.fs.Create("unicorn-lazor-death")
 	if err != nil {
-		t.Fatalf(err.Error())
+		t.Fatal(err)
 	}
 	if _, err := fd.Write([]byte(" ")); err != nil {
 		t.Fatal(err)