Switch to Go 1.25+

.github/workflows/test.yml

@@ -26,23 +26,19 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-24.04, ubuntu-24.04-arm]
-        go-version: [1.24.x, 1.25.x, 1.26.x]
+        go-version: [1.25.x, 1.26.x]
         libpathrs: ["libpathrs", ""]
         rootless: ["rootless", ""]
         race: ["-race", ""]
         criu: ["", "criu-dev"]
         exclude:
           # Disable most of criu-dev jobs, as they are expensive
           # (need to compile criu) and don't add much value/coverage.
-          - criu: criu-dev
-            go-version: 1.24.x
           - criu: criu-dev
             go-version: 1.25.x
           - criu: criu-dev
             rootless: rootless
           # Do race detection only with latest stable Go version.
-          - race: -race
-            go-version: 1.24.x
           - race: -race
             go-version: 1.25.x
 

events.go

@@ -53,16 +53,14 @@ information is displayed once every 5 seconds.`,
 			events = make(chan *types.Event, 1024)
 			group  = &sync.WaitGroup{}
 		)
-		group.Add(1)
-		go func() {
-			defer group.Done()
+		group.Go(func() {
 			enc := json.NewEncoder(os.Stdout)
 			for e := range events {
 				if err := enc.Encode(e); err != nil {
 					logrus.Error(err)
 				}
 			}
-		}()
+		})
 		if context.Bool("stats") {
 			s, err := container.Stats()
 			if err != nil {

go.mod

@@ -1,6 +1,6 @@
 module github.com/opencontainers/runc
 
-go 1.24.0
+go 1.25.0
 
 require (
 	github.com/checkpoint-restore/go-criu/v7 v7.2.0

tests/cmd/recvtty/recvtty.go

@@ -117,17 +117,13 @@ func handleSingle(path string, noStdin bool) error {
 		wg            sync.WaitGroup
 		inErr, outErr error
 	)
-	wg.Add(1)
-	go func() {
+	wg.Go(func() {
 		_, outErr = io.Copy(os.Stdout, c)
-		wg.Done()
-	}()
+	})
 	if !noStdin {
-		wg.Add(1)
-		go func() {
+		wg.Go(func() {
 			_, inErr = io.Copy(c, os.Stdin)
-			wg.Done()
-		}()
+		})
 	}
 
 	// Only close the master fd once we've stopped copying.

tests/integration/create.bats

@@ -38,7 +38,9 @@ is_allowed_fdtarget() {
 			# overlayfs binary reference (CVE-2019-5736)
 			grep -Ex "/runc" <<<"$target" ||
 			# memfd cloned binary (CVE-2019-5736)
-			grep -Fx "/memfd:runc_cloned:/proc/self/exe (deleted)" <<<"$target"
+			grep -Fx "/memfd:runc_cloned:/proc/self/exe (deleted)" <<<"$target" ||
+			# Go 1.25+ runtime opens these cgroup v1 files (see https://go.dev/cl/670497).
+			grep -Ex ".*/cpu.cfs_(quota|period)_us" <<<"$target"
 	} >/dev/null
 	return "$?"
 }