From c0f0efada218fefd6dae7fe01b90887e83969e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Wed, 15 Mar 2023 20:36:01 +0100
Subject: [PATCH] Update to Go 1.18
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It is already required in practice, see
> grep 'func .*]('

This also renders the -compat=1.17 option to (go mod tidy)
unnecessary, so drop it.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
 .cirrus.yml | 2 +-
 Makefile    | 4 ++--
 go.mod      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index cf79434ac0..ebd9c32b3a 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -121,7 +121,7 @@ vendor_task:
 
     # Runs within Cirrus's "community cluster"
     container:
-        image: docker.io/library/golang:1.17
+        image: docker.io/library/golang:1.18
         cpu: 1
         memory: 1
 
diff --git a/Makefile b/Makefile
index 729456d948..508c95c285 100644
--- a/Makefile
+++ b/Makefile
@@ -185,11 +185,11 @@ test-unit: tests/testreport/testreport
 	$(GO_TEST) -v -tags "$(STORAGETAGS) $(SECURITYTAGS)" -cover $(RACEFLAGS) ./cmd/buildah -args --root $$tmp/root --runroot $$tmp/runroot --storage-driver vfs --signature-policy $(shell pwd)/tests/policy.json --registries-conf $(shell pwd)/tests/registries.conf
 
 vendor-in-container:
-	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.17 make vendor
+	podman run --privileged --rm --env HOME=/root -v `pwd`:/src -w /src docker.io/library/golang:1.18 make vendor
 
 .PHONY: vendor
 vendor:
-	GO111MODULE=on $(GO) mod tidy -compat=1.17
+	GO111MODULE=on $(GO) mod tidy
 	GO111MODULE=on $(GO) mod vendor
 	GO111MODULE=on $(GO) mod verify
 
diff --git a/go.mod b/go.mod
index 860c9d7a94..bb1d18f230 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/containers/buildah
 
-go 1.17
+go 1.18
 
 require (
 	github.com/containerd/containerd v1.7.0