Merge pull request #3920 from kolyshkin/go121

ci: add go 1.21, rm go 1.19, fix cirrus jobs
opencontainers · Aug 8, 2023 · c62bbb2 · c62bbb2
2 parents 74c125d + 5741ea2
commit c62bbb2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -77,7 +77,7 @@ task:
   env:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
-    GO_VERSION: "1.19"
+    GO_VERSION: "1.20"
     BATS_VERSION: "v1.9.0"
     RPMS: gcc git iptables jq glibc-static libseccomp-devel make criu fuse-sshfs
     # yamllint disable rule:key-duplicates

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -23,15 +23,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-20.04, ubuntu-22.04]
-        go-version: [1.19.x, 1.20.x]
+        go-version: [1.20.x, 1.21.x]
         rootless: ["rootless", ""]
         race: ["-race", ""]
         criu: ["", "criu-dev"]
         exclude:
           - criu: criu-dev
             rootless: rootless
           - criu: criu-dev
-            go-version: 1.19.x
+            go-version: 1.20.x
           - criu: criu-dev
             race: -race
     runs-on: ${{ matrix.os }}

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/opencontainers/runc
 
-go 1.19
+go 1.20
 
 require (
 	github.com/checkpoint-restore/go-criu/v6 v6.3.0