From 5ecd40b9bd52fe52a88648cebd4d57ee8a3e6f9f Mon Sep 17 00:00:00 2001
From: Austin Vazquez <macedonv@amazon.com>
Date: Thu, 2 Feb 2023 19:34:13 +0000
Subject: [PATCH] Add Go 1.20, require Go 1.19, drop Go 1.18

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
---
 .cirrus.yml                    | 2 +-
 .github/workflows/test.yml     | 4 ++--
 .github/workflows/validate.yml | 4 ++--
 Dockerfile                     | 2 +-
 README.md                      | 2 +-
 go.mod                         | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index aad6ff143..aa0ea03b4 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -70,7 +70,7 @@ task:
   env:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
-    GO_VERSION: "1.18"
+    GO_VERSION: "1.19"
     BATS_VERSION: "v1.3.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
index b324282c5..73bae8009 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,13 +23,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [1.18.x, 1.19.x]
+        go-version: [1.19.x, 1.20.x]
         rootless: ["rootless", ""]
         race: ["-race", ""]
         criu: [""]
         include:
           # Also test against latest criu-dev
-          - go-version: 1.18.x
+          - go-version: 1.19.x
             rootless: ""
             race: ""
             criu: "criu-dev"
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index eb15b5bf8..0d2775ae5 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -8,7 +8,7 @@ on:
       - release-*
   pull_request:
 env:
-  GO_VERSION: 1.19.x
+  GO_VERSION: 1.20.x
 permissions:
   contents: read
 
@@ -32,7 +32,7 @@ jobs:
           sudo apt -q install libseccomp-dev
       - uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.48
+          version: v1.51
       # 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 1b41b7fc1..934883405 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG GO_VERSION=1.18
+ARG GO_VERSION=1.19
 ARG BATS_VERSION=v1.3.0
 ARG LIBSECCOMP_VERSION=2.5.4
 
diff --git a/README.md b/README.md
index d0fa9e1df..181f1dd2b 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ A third party security audit was performed by Cure53, you can see the full repor
 
 ## Building
 
-`runc` only supports Linux. It must be built with Go version 1.18 or higher.
+`runc` only supports Linux. It must be built with Go version 1.19 or higher.
 
 In order to enable seccomp support you will need to install `libseccomp` on your platform.
 > e.g. `libseccomp-devel` for CentOS, or `libseccomp-dev` for Ubuntu
diff --git a/go.mod b/go.mod
index d07608a1e..395a8b0a3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/opencontainers/runc
 
-go 1.18
+go 1.19
 
 require (
 	github.com/checkpoint-restore/go-criu/v6 v6.3.0