From 34480678b90b28087aa39551283787a3bd993c3a Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 18 Sep 2018 11:17:11 -0700 Subject: [PATCH 1/2] Switch from x/net/context to context Since go 1.7, "context" is a standard package. Since go 1.9, x/net/context merelyprovides some types aliased to those in the standard context package, so there is no functional change. Signed-off-by: Kir Kolyshkin --- continuityfs/fuse.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continuityfs/fuse.go b/continuityfs/fuse.go index 2485b054..5618e1e8 100644 --- a/continuityfs/fuse.go +++ b/continuityfs/fuse.go @@ -19,6 +19,7 @@ package continuityfs import ( + "context" "errors" "fmt" "io" @@ -31,7 +32,6 @@ import ( "github.com/containerd/continuity" "github.com/opencontainers/go-digest" "github.com/sirupsen/logrus" - "golang.org/x/net/context" ) // File represents any file type (non directory) in the filesystem From 508ef95ef41e88e980aaffaade10a79351fc8339 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Tue, 18 Sep 2018 13:22:34 -0700 Subject: [PATCH 2/2] travis CI: rm go 1.8 Go 1.8 is unsupported since Go 1.10 was released in Feb 2018. In fact, Go 1.9 is also unsupported (since Go 1.11 was released in 24 August 2018), but let it stay for now. Signed-off-by: Kir Kolyshkin --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ac6dcf7e..05d6f62b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,9 @@ language: go sudo: required go: - - 1.8.x - 1.9.x - 1.10.x - - 1.x + - 1.11.x - tip go_import_path: github.com/containerd/continuity