diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index cbc4437a..a106bf00 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -4,7 +4,7 @@ name: test on: ["push", "pull_request"] env: - GO_VERSION: "1.18" + GO_VERSION: "1.20" LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64" jobs: diff --git a/go.mod b/go.mod index 486d01d8..1ad752a0 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/containernetworking/plugins -go 1.18 +go 1.20 require ( github.com/Microsoft/hcsshim v0.9.8 diff --git a/pkg/ns/ns_suite_test.go b/pkg/ns/ns_suite_test.go index ecc5e34e..183790e2 100644 --- a/pkg/ns/ns_suite_test.go +++ b/pkg/ns/ns_suite_test.go @@ -15,7 +15,6 @@ package ns_test import ( - "math/rand" "runtime" "testing" @@ -24,7 +23,6 @@ import ( ) func TestNs(t *testing.T) { - rand.Seed(GinkgoRandomSeed()) runtime.LockOSThread() RegisterFailHandler(Fail) diff --git a/plugins/main/tap/tap_test.go b/plugins/main/tap/tap_test.go index 7112a452..771f6afa 100644 --- a/plugins/main/tap/tap_test.go +++ b/plugins/main/tap/tap_test.go @@ -17,7 +17,6 @@ package main import ( "encoding/json" "fmt" - "io/ioutil" "net" "os" "strings" @@ -179,7 +178,7 @@ var _ = Describe("Add, check, remove tap plugin", func() { targetNS, err = testutils.NewNS() Expect(err).NotTo(HaveOccurred()) - dataDir, err = ioutil.TempDir("", "dummy") + dataDir, err = os.MkdirTemp("", "dummy") Expect(err).NotTo(HaveOccurred()) }) diff --git a/plugins/meta/portmap/portmap_suite_test.go b/plugins/meta/portmap/portmap_suite_test.go index a376f293..0b40903f 100644 --- a/plugins/meta/portmap/portmap_suite_test.go +++ b/plugins/meta/portmap/portmap_suite_test.go @@ -15,7 +15,6 @@ package main import ( - "math/rand" "net" "os/exec" "path/filepath" @@ -32,8 +31,6 @@ import ( ) func TestPortmap(t *testing.T) { - rand.Seed(GinkgoRandomSeed()) - RegisterFailHandler(Fail) RunSpecs(t, "plugins/meta/portmap") } diff --git a/scripts/release.sh b/scripts/release.sh index 4467a7a7..5002428e 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -16,7 +16,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR} mkdir -p ${SRC_DIR}/${RELEASE_DIR} mkdir -p ${OUTPUT_DIR} -$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.18-alpine \ +$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.20-alpine \ /bin/sh -xe -c "\ apk --no-cache add bash tar; cd /go/src/github.com/containernetworking/plugins; umask 0022;