Skip to content

Commit c795a3c

Browse files
authored
Merge pull request #888 from jingyuanliang/go120
Bump to golang 1.20 to pick up go1.19.6 / go1.20.1 CVE fixes
2 parents c10af01 + d8fc886 commit c795a3c

File tree

6 files changed

+4
-10
lines changed

6 files changed

+4
-10
lines changed

Diff for: .github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: test
44
on: ["push", "pull_request"]
55

66
env:
7-
GO_VERSION: "1.18"
7+
GO_VERSION: "1.20"
88
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le riscv64"
99

1010
jobs:

Diff for: go.mod

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

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/Microsoft/hcsshim v0.9.8

Diff for: pkg/ns/ns_suite_test.go

-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package ns_test
1616

1717
import (
18-
"math/rand"
1918
"runtime"
2019
"testing"
2120

@@ -24,7 +23,6 @@ import (
2423
)
2524

2625
func TestNs(t *testing.T) {
27-
rand.Seed(GinkgoRandomSeed())
2826
runtime.LockOSThread()
2927

3028
RegisterFailHandler(Fail)

Diff for: plugins/main/tap/tap_test.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package main
1717
import (
1818
"encoding/json"
1919
"fmt"
20-
"io/ioutil"
2120
"net"
2221
"os"
2322
"strings"
@@ -179,7 +178,7 @@ var _ = Describe("Add, check, remove tap plugin", func() {
179178
targetNS, err = testutils.NewNS()
180179
Expect(err).NotTo(HaveOccurred())
181180

182-
dataDir, err = ioutil.TempDir("", "dummy")
181+
dataDir, err = os.MkdirTemp("", "dummy")
183182
Expect(err).NotTo(HaveOccurred())
184183
})
185184

Diff for: plugins/meta/portmap/portmap_suite_test.go

-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
package main
1616

1717
import (
18-
"math/rand"
1918
"net"
2019
"os/exec"
2120
"path/filepath"
@@ -32,8 +31,6 @@ import (
3231
)
3332

3433
func TestPortmap(t *testing.T) {
35-
rand.Seed(GinkgoRandomSeed())
36-
3734
RegisterFailHandler(Fail)
3835
RunSpecs(t, "plugins/meta/portmap")
3936
}

Diff for: scripts/release.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR}
1616
mkdir -p ${SRC_DIR}/${RELEASE_DIR}
1717
mkdir -p ${OUTPUT_DIR}
1818

19-
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.18-alpine \
19+
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.20-alpine \
2020
/bin/sh -xe -c "\
2121
apk --no-cache add bash tar;
2222
cd /go/src/github.com/containernetworking/plugins; umask 0022;

0 commit comments

Comments
 (0)