From fac5ae9da280353fabd2c23da46d804a9973b116 Mon Sep 17 00:00:00 2001
From: Timo Beckers <timo@isovalent.com>
Date: Mon, 22 Aug 2022 16:07:12 +0200
Subject: [PATCH] Bump minimum required Go version to 1.18, test using 1.19

Drop build tags from _fuzz.go as they're no longer required.

Signed-off-by: Timo Beckers <timo@isovalent.com>
---
 .semaphore/semaphore.yml | 8 ++++----
 btf/fuzz_test.go         | 3 ---
 examples/go.mod          | 2 +-
 fuzz_test.go             | 3 ---
 go.mod                   | 2 +-
 5 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml
index 4a377403d..3cc26236c 100644
--- a/.semaphore/semaphore.yml
+++ b/.semaphore/semaphore.yml
@@ -23,10 +23,10 @@ blocks:
       prologue:
         commands:
           - sudo sh -c 'swapoff -a && fallocate -l 2G /swapfile && chmod 0600 /swapfile && mkswap /swapfile && swapon /swapfile'
-          - sudo mkdir -p /usr/local/golang/1.18 && curl -fL "https://go.dev/dl/go1.18.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local/golang/1.18
-          - sem-version go 1.18
+          - sudo mkdir -p /usr/local/golang/1.19 && curl -fL "https://go.dev/dl/go1.19.linux-amd64.tar.gz" | sudo tar -xz -C /usr/local/golang/1.19
+          - sem-version go 1.19
           - export PATH="$PATH:$(go env GOPATH)/bin"
-          - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.0
+          - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0
           - go install gotest.tools/gotestsum@v1.8.1
           - checkout
           - cache restore
@@ -61,7 +61,7 @@ blocks:
           - cache store
       - name: Run unit tests on previous stable Go
         commands:
-          - sem-version go 1.17
+          - sem-version go 1.18
           - go test -v ./cmd/bpf2go -run TestRun
           - gotestsum --raw-command --ignore-non-json-output-lines --junitfile junit.xml -- ./run-tests.sh $CI_MAX_KERNEL_VERSION -short -count 1 -json ./...
       - name: Run unit tests
diff --git a/btf/fuzz_test.go b/btf/fuzz_test.go
index 3bb50c041..cf89e406b 100644
--- a/btf/fuzz_test.go
+++ b/btf/fuzz_test.go
@@ -1,6 +1,3 @@
-//go:build go1.18
-// +build go1.18
-
 package btf
 
 import (
diff --git a/examples/go.mod b/examples/go.mod
index 050ba428f..6894907b6 100644
--- a/examples/go.mod
+++ b/examples/go.mod
@@ -1,6 +1,6 @@
 module github.com/cilium/ebpf/examples
 
-go 1.17
+go 1.18
 
 require (
 	github.com/cilium/ebpf v0.8.2-0.20220424153111-6da9518107a8
diff --git a/fuzz_test.go b/fuzz_test.go
index dc32c7858..a41f68a62 100644
--- a/fuzz_test.go
+++ b/fuzz_test.go
@@ -1,6 +1,3 @@
-//go:build go1.18
-// +build go1.18
-
 package ebpf
 
 import (
diff --git a/go.mod b/go.mod
index a53f6ba28..bcf59c4cd 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/cilium/ebpf
 
-go 1.17
+go 1.18
 
 require (
 	github.com/frankban/quicktest v1.14.0