From 11a0e864afad791700d368d222e099fb5c03758b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 21 Mar 2024 14:45:11 +0000
Subject: [PATCH 1/3] chore(deps): update dependency
 containers/automation_images to v20240320

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 .cirrus.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 4536c7035..d09baa5fa 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -30,7 +30,7 @@ env:
     SKOPEO_PR:
 
     # Google-cloud VM Images
-    IMAGE_SUFFIX: "c20240125t184057z-f39f38d13"
+    IMAGE_SUFFIX: "c20240320t153921z-f39f38d13"
     FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
     DEBIAN_CACHE_IMAGE_NAME: "debian-${IMAGE_SUFFIX}"
 

From d847108fb49c8ccf0649cc98216f5bc80c663698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Thu, 21 Mar 2024 20:11:15 +0100
Subject: [PATCH 2/3] Use (go install) instead of (go get)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This use of (go get) was deprecated back in Go 1.18.

Also don't use our build tags for building unrelated tools.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2f25abe32..66cd562d0 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,7 @@ tools: .install.gitvalidation .install.golangci-lint
 
 .install.gitvalidation:
 	if [ ! -x "$(GOBIN)/git-validation" ]; then \
-		GO111MODULE="off" go get $(BUILDFLAGS) github.com/vbatts/git-validation; \
+		go install github.com/vbatts/git-validation@latest; \
 	fi
 
 .install.golangci-lint:

From b6b60bf5af8bb810379015f1af413bc7ef0b5d6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= <mitr@redhat.com>
Date: Thu, 21 Mar 2024 20:13:48 +0100
Subject: [PATCH 3/3] Stop setting GO111MODULE=on
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It's the default since Go 1.16.

In theory the environment might be setting it to off, and breaking
our builds; unless something compelling comes up, I think that
hypothetical environment should be changed, nowadays.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
---
 Makefile         | 6 +++---
 hack/validate.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 66cd562d0..9bdf578f6 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ BUILD_TAGS_DARWIN_CROSS = containers_image_openpgp
 BUILDTAGS = btrfs_noversion libdm_no_deferred_remove
 BUILDFLAGS := -tags "$(BUILDTAGS)"
 
-PACKAGES := $(shell GO111MODULE=on go list $(BUILDFLAGS) ./...)
+PACKAGES := $(shell go list $(BUILDFLAGS) ./...)
 SOURCE_DIRS = $(shell echo $(PACKAGES) | awk 'BEGIN{FS="/"; RS=" "}{print $$4}' | uniq)
 
 PREFIX ?= ${DESTDIR}/usr
@@ -41,7 +41,7 @@ export PATH := $(PATH):${GOBIN}
 all: tools test validate .gitvalidation
 
 build:
-	GO111MODULE="on" go build $(BUILDFLAGS) ./...
+	go build $(BUILDFLAGS) ./...
 
 $(MANPAGES): %: %.md
 	$(GOMD2MAN) -in $< -out $@
@@ -78,7 +78,7 @@ clean:
 	rm -rf $(MANPAGES)
 
 test:
-	@GO111MODULE="on" go test $(BUILDFLAGS) -cover ./...
+	@go test $(BUILDFLAGS) -cover ./...
 
 fmt:
 	@gofmt -l -s -w $(SOURCE_DIRS)
diff --git a/hack/validate.sh b/hack/validate.sh
index 078d34fff..b8dafb5e4 100755
--- a/hack/validate.sh
+++ b/hack/validate.sh
@@ -15,7 +15,7 @@ if [[ -z $(type -P gofmt) ]]; then
 fi
 
 echo "Executing go vet"
-GO111MODULE="on" go vet -tags="$BUILDTAGS" ./...
+go vet -tags="$BUILDTAGS" ./...
 
 echo "Executing gofmt"
 OUTPUT=$(gofmt -s -l . | sed -e '/^vendor/d')