Skip to content

Commit 8632ace

Browse files
authored
Merge pull request #649 from squeed/libcni-1.0
libcni v1.0 bumps, dependency updates
2 parents 7995c2d + 156e59c commit 8632ace

531 files changed

Lines changed: 11428 additions & 17341 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/test.yaml

Lines changed: 5 additions & 1 deletion
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.15"
7+
GO_VERSION: "1.16"
88
LINUX_ARCHES: "amd64 386 arm arm64 s390x mips64le ppc64le"
99

1010
jobs:
@@ -39,6 +39,10 @@ jobs:
3939
uses: actions/setup-go@v2
4040
with:
4141
go-version: ${{ env.GO_VERSION }}
42+
- name: Set up Go for root
43+
run: |
44+
sudo ln -sf `which go` `sudo which go` || true
45+
sudo go version
4246
- uses: actions/checkout@v2
4347

4448
- name: Install test binaries

go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
module github.com/containernetworking/plugins
22

3-
go 1.14
3+
go 1.16
44

55
require (
6-
github.com/Microsoft/hcsshim v0.8.16
6+
github.com/Microsoft/hcsshim v0.8.20
77
github.com/alexflint/go-filemutex v1.1.0
88
github.com/buger/jsonparser v1.1.1
9-
github.com/containernetworking/cni v1.0.0-rc1
10-
github.com/coreos/go-iptables v0.5.0
11-
github.com/coreos/go-systemd/v22 v22.2.0
9+
github.com/containernetworking/cni v1.0.0
10+
github.com/coreos/go-iptables v0.6.0
11+
github.com/coreos/go-systemd/v22 v22.3.2
1212
github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c
1313
github.com/d2g/dhcp4client v1.0.0
1414
github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5
15-
github.com/godbus/dbus/v5 v5.0.3
16-
github.com/j-keck/arping v1.0.1
17-
github.com/mattn/go-shellwords v1.0.11
18-
github.com/onsi/ginkgo v1.13.0
19-
github.com/onsi/gomega v1.10.3
20-
github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8
15+
github.com/godbus/dbus/v5 v5.0.4
16+
github.com/j-keck/arping v1.0.2
17+
github.com/mattn/go-shellwords v1.0.12
18+
github.com/onsi/ginkgo v1.16.4
19+
github.com/onsi/gomega v1.15.0
20+
github.com/safchain/ethtool v0.0.0-20210803160452-9aa261dae9b1
2121
github.com/sirupsen/logrus v1.8.1 // indirect
2222
github.com/vishvananda/netlink v1.1.1-0.20210330154013-f5de75959ad5
2323
github.com/vishvananda/netns v0.0.0-20210104183010-2eb08e3e575f // indirect
24-
golang.org/x/sys v0.0.0-20210414055047-fe65e336abe0
24+
golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e
2525
)

go.sum

Lines changed: 117 additions & 26 deletions
Large diffs are not rendered by default.

scripts/release.sh

Lines changed: 1 addition & 1 deletion
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 --rm golang:1.15-alpine \
19+
$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins:z --rm golang:1.16-alpine \
2020
/bin/sh -xe -c "\
2121
apk --no-cache add bash tar;
2222
cd /go/src/github.com/containernetworking/plugins; umask 0022;

vendor/github.com/Microsoft/hcsshim/CODEOWNERS

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/Protobuild.toml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/computestorage/setup.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/computestorage/storage.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/container.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/Microsoft/hcsshim/errors.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)