From 9bf4b859a12bd6ceb6b1782384b6a389ff527e55 Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Tue, 4 Feb 2020 11:50:26 +0800 Subject: [PATCH 1/2] AArch64: fix golint error on ARM CI. Recently, ARM CI frequently failed on the following golint error: Error: pkg/rootless/rootless.go:57:2: comment on exported var `IsRootless` should be of the form `IsRootless ...` (golint) Fixes: #2434 Signed-off-by: Penny Zheng --- pkg/rootless/rootless.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go index 8366bb4b44..c26e3b87f9 100644 --- a/pkg/rootless/rootless.go +++ b/pkg/rootless/rootless.go @@ -54,7 +54,7 @@ var ( "source": "rootless", }) - //The function is declared this way for mocking in unit tests + // IsRootless is declared this way for mocking in unit tests IsRootless = isRootlessFunc ) From 96a49a894db668132518acbf58b8bb707a0dde44 Mon Sep 17 00:00:00 2001 From: Penny Zheng Date: Tue, 4 Feb 2020 16:33:38 +0800 Subject: [PATCH 2/2] AArch64: arm ci failed on stale Gopkg.lock. Arm CI failed on the following error: Gopkg.lock is out of sync: github.com/opencontainers/runc/libcontainer/system: imported or required, but missing from Gopkg.lock's input-imports. Fixes: #2434 Signed-off-by: Penny Zheng --- Gopkg.lock | 1 + 1 file changed, 1 insertion(+) diff --git a/Gopkg.lock b/Gopkg.lock index 3adc4dd883..5aa0c164a6 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -795,6 +795,7 @@ "github.com/opencontainers/runc/libcontainer/cgroups/systemd", "github.com/opencontainers/runc/libcontainer/configs", "github.com/opencontainers/runc/libcontainer/specconv", + "github.com/opencontainers/runc/libcontainer/system", "github.com/opencontainers/runc/libcontainer/utils", "github.com/opencontainers/runtime-spec/specs-go", "github.com/opentracing/opentracing-go",