From ba5a519d763835d0ba303456ec6caf39699c75bc Mon Sep 17 00:00:00 2001
From: Kir Kolyshkin <kolyshkin@gmail.com>
Date: Wed, 26 Feb 2025 13:13:13 -0800
Subject: [PATCH] [1.2] Add Go 1.24, switch to Go 1.23 for build

Since Go 1.22 is no longer supported, let's switch to Go 1.23 for
official builds, cirrus, and GHA validate jobs.

Add Go 1.24 to testing matrix, and keep Go 1.22.

Bump golangci-lint to a version which supports Go 1.24.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
---
 .cirrus.yml                    | 2 +-
 .github/workflows/test.yml     | 6 +++++-
 .github/workflows/validate.yml | 4 ++--
 Dockerfile                     | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 9912d74da..e63ef51cf 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -77,7 +77,7 @@ task:
   env:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
-    GO_VERSION: "1.22"
+    GO_VERSION: "1.23"
     BATS_VERSION: "v1.9.0"
     RPMS: gcc git iptables jq glibc-static libseccomp-devel make criu fuse-sshfs container-selinux
     # yamllint disable rule:key-duplicates
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 7f4c5b0fc..17b0947f4 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-24.04, actuated-arm64-6cpu-8gb]
-        go-version: [1.22.x, 1.23.x]
+        go-version: [1.22.x, 1.23.x, 1.24.x]
         rootless: ["rootless", ""]
         race: ["-race", ""]
         criu: ["", "criu-dev"]
@@ -33,12 +33,16 @@ jobs:
           # (need to compile criu) and don't add much value/coverage.
           - criu: criu-dev
             go-version: 1.22.x
+          - criu: criu-dev
+            go-version: 1.23.x
           - criu: criu-dev
             rootless: rootless
           - criu: criu-dev
             race: -race
           - go-version: 1.22.x
             os: actuated-arm64-6cpu-8gb
+          - go-version: 1.23.x
+            os: actuated-arm64-6cpu-8gb
           - race: "-race"
             os: actuated-arm64-6cpu-8gb
           - criu: criu-dev
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 9f6c7ffc6..29066e260 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -8,7 +8,7 @@ on:
       - release-*
   pull_request:
 env:
-  GO_VERSION: 1.22.x
+  GO_VERSION: 1.23.x
 permissions:
   contents: read
 
@@ -40,7 +40,7 @@ jobs:
           sudo apt -qy install libseccomp-dev
       - uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.60
+          version: v1.64
       # Extra linters, only checking new code from a pull request.
       - name: lint-extra
         if: github.event_name == 'pull_request'
diff --git a/Dockerfile b/Dockerfile
index d04a95889..f51f5956c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.22
+ARG GO_VERSION=1.23
 ARG BATS_VERSION=v1.9.0
 ARG LIBSECCOMP_VERSION=2.5.5