From 279bbc307ef7e8926dbb582c258a87c39724d46b Mon Sep 17 00:00:00 2001 From: Thomas Jackson Date: Tue, 22 Jan 2019 11:21:57 -0800 Subject: [PATCH] Switch from godeps to `go mod` --- Godeps/Godeps.json | 22 ---------------------- Godeps/Readme | 5 ----- build/build.sh | 1 + go.mod | 7 +++++++ go.sum | 6 ++++++ vendor/modules.txt | 6 ++++++ 6 files changed, 20 insertions(+), 27 deletions(-) delete mode 100644 Godeps/Godeps.json delete mode 100644 Godeps/Readme create mode 100644 go.mod create mode 100644 go.sum create mode 100644 vendor/modules.txt diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json deleted file mode 100644 index de1ca71..0000000 --- a/Godeps/Godeps.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "ImportPath": "k8s.io/git-sync", - "GoVersion": "go1.6", - "GodepVersion": "v66", - "Packages": [ - "./..." - ], - "Deps": [ - { - "ImportPath": "github.com/golang/glog", - "Rev": "23def4e6c14b4da8ac2ed8007337bc5eb5007998" - }, - { - "ImportPath": "github.com/thockin/glogr", - "Rev": "7a7f3ced4f9f52e96710761820bd85ed6c400aa5" - }, - { - "ImportPath": "github.com/thockin/logr", - "Rev": "103d90809f342ce8b186c0bc903a34bc1c8007be" - } - ] -} diff --git a/Godeps/Readme b/Godeps/Readme deleted file mode 100644 index 4cdaa53..0000000 --- a/Godeps/Readme +++ /dev/null @@ -1,5 +0,0 @@ -This directory tree is generated automatically by godep. - -Please do not edit. - -See https://github.com/tools/godep for more information. diff --git a/build/build.sh b/build/build.sh index bb61a93..4ab5ccf 100755 --- a/build/build.sh +++ b/build/build.sh @@ -38,6 +38,7 @@ fi export CGO_ENABLED=0 export GOARCH="${ARCH}" export GOOS="${OS}" +export GOFLAGS=-mod=vendor go install \ -installsuffix "static" \ diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..3af7c15 --- /dev/null +++ b/go.mod @@ -0,0 +1,7 @@ +module k8s.io/git-sync + +require ( + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect + github.com/thockin/glogr v0.0.0-20160825042232-7a7f3ced4f9f + github.com/thockin/logr v0.0.0-20160822044224-103d90809f34 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..5b5b4e4 --- /dev/null +++ b/go.sum @@ -0,0 +1,6 @@ +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/thockin/glogr v0.0.0-20160825042232-7a7f3ced4f9f h1:UQ/VqTtxN8EoIShWVbNR9b0/vyxKLwhV6ZGcIjZ5KB4= +github.com/thockin/glogr v0.0.0-20160825042232-7a7f3ced4f9f/go.mod h1:HRvPbLXOCiSU8hpsTlLSX4Fw6l+yF2uziElIkThrlsI= +github.com/thockin/logr v0.0.0-20160822044224-103d90809f34 h1:iVWjMSZyeDCd1D2XQkUjsAWPfvA3M4aPGGsEmxaXY1s= +github.com/thockin/logr v0.0.0-20160822044224-103d90809f34/go.mod h1:GEqn6NzwaoUO+OS+z1oR6Ka9NXmRDe3NUF5KZUAoT+I= diff --git a/vendor/modules.txt b/vendor/modules.txt new file mode 100644 index 0000000..de7d6b4 --- /dev/null +++ b/vendor/modules.txt @@ -0,0 +1,6 @@ +# github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b +github.com/golang/glog +# github.com/thockin/glogr v0.0.0-20160825042232-7a7f3ced4f9f +github.com/thockin/glogr +# github.com/thockin/logr v0.0.0-20160822044224-103d90809f34 +github.com/thockin/logr