Skip to content

Commit 9da42c2

Browse files
committed
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 <[email protected]>
1 parent 6660b7a commit 9da42c2

File tree

4 files changed

+5
-11
lines changed

4 files changed

+5
-11
lines changed

.semaphore/semaphore.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ blocks:
2323
prologue:
2424
commands:
2525
- sudo sh -c 'swapoff -a && fallocate -l 2G /swapfile && chmod 0600 /swapfile && mkswap /swapfile && swapon /swapfile'
26-
- 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
27-
- sem-version go 1.18
26+
- 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
27+
- sem-version go 1.19
2828
- export PATH="$PATH:$(go env GOPATH)/bin"
29-
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.45.0
29+
- curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.48.0
3030
- go install gotest.tools/[email protected]
3131
- checkout
3232
- cache restore
@@ -61,7 +61,7 @@ blocks:
6161
- cache store
6262
- name: Run unit tests on previous stable Go
6363
commands:
64-
- sem-version go 1.17
64+
- sem-version go 1.18
6565
- go test -v ./cmd/bpf2go -run TestRun
6666
- gotestsum --raw-command --ignore-non-json-output-lines --junitfile junit.xml -- ./run-tests.sh $CI_MAX_KERNEL_VERSION -short -count 1 -json ./...
6767
- name: Run unit tests

btf/fuzz_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build go1.18
2-
// +build go1.18
3-
41
package btf
52

63
import (

fuzz_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
//go:build go1.18
2-
// +build go1.18
3-
41
package ebpf
52

63
import (

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cilium/ebpf
22

3-
go 1.17
3+
go 1.18
44

55
require (
66
github.com/frankban/quicktest v1.14.0

0 commit comments

Comments
 (0)