From d9a2348c420ee9fc1e563f7181fbbd3bf5134cda Mon Sep 17 00:00:00 2001 From: Ivan Krutov Date: Fri, 8 Dec 2017 20:12:50 +0300 Subject: [PATCH] Migrated to dep (fixes #305) --- .travis.yml | 4 +- Gopkg.lock | 79 +++++++++++++ Gopkg.toml | 29 +++++ docs/contributing.adoc | 10 +- vendor/vendor.json | 247 ----------------------------------------- 5 files changed, 115 insertions(+), 254 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml delete mode 100644 vendor/vendor.json diff --git a/.travis.yml b/.travis.yml index c3e6b3a2..a71a761e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,11 +13,11 @@ script: - gox -os "linux darwin windows" -arch "amd64" -osarch="windows/386" -output "dist/{{.Dir}}_{{.OS}}_{{.Arch}}" -ldflags "-X main.buildStamp=`date -u '+%Y-%m-%d_%I:%M:%S%p'` -X main.gitRevision=`git describe --tags || git rev-parse HEAD`" before_install: - - go get -u github.com/kardianos/govendor + - go get -u github.com/golang/dep/cmd/dep install: - go get -u github.com/mitchellh/gox # cross compile - - govendor sync + - dep ensure deploy: - provider: releases diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 00000000..8dc93511 --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,79 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/Microsoft/go-winio" + packages = ["."] + revision = "f3b1913901892ada21d52d0cffe1d4c7080d36b7" + version = "v0.3.9" + +[[projects]] + name = "github.com/Sirupsen/logrus" + packages = ["."] + revision = "5b60b3d3ee017ed00bcd0225fcca7acab767844b" + +[[projects]] + branch = "master" + name = "github.com/aandryashin/matchers" + packages = [".","httpresp"] + revision = "435295ea180e58dbfa526db1ebab8c801b4c2b75" + +[[projects]] + name = "github.com/docker/distribution" + packages = ["digestset","reference"] + revision = "ce936a85915a55418ea62dc32a0a1274f2740104" + +[[projects]] + name = "github.com/docker/docker" + packages = ["api","api/types","api/types/blkiodev","api/types/container","api/types/events","api/types/filters","api/types/image","api/types/mount","api/types/network","api/types/registry","api/types/strslice","api/types/swarm","api/types/time","api/types/versions","api/types/volume","client","pkg/ioutils","pkg/longpath","pkg/system","pkg/tlsconfig"] + revision = "7ca86796c94c7ae0c62680ac664f97ab5f35ebec" + +[[projects]] + name = "github.com/docker/go-connections" + packages = ["nat","sockets","tlsconfig"] + revision = "e15c02316c12de00874640cd76311849de2aeed5" + +[[projects]] + name = "github.com/docker/go-units" + packages = ["."] + revision = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52" + version = "v0.3.2" + +[[projects]] + branch = "master" + name = "github.com/docker/libtrust" + packages = ["."] + revision = "aabc10ec26b754e797f9028f4589c5b7bd90dc20" + +[[projects]] + name = "github.com/opencontainers/go-digest" + packages = ["."] + revision = "aa2ec055abd10d26d539eb630a92241b781ce4bc" + version = "v1.0.0-rc0" + +[[projects]] + name = "github.com/pborman/uuid" + packages = ["."] + revision = "1b00554d822231195d1babd97ff4a781231955c9" + +[[projects]] + name = "github.com/pkg/errors" + packages = ["."] + revision = "c605e284fe17294bda444b34710735b29d1a9d90" + +[[projects]] + name = "golang.org/x/net" + packages = ["context","context/ctxhttp","proxy","websocket"] + revision = "feeb485667d1fdabe727840fe00adc22431bc86e" + +[[projects]] + name = "golang.org/x/sys" + packages = ["unix","windows"] + revision = "9ccfe848b9db8435a24c424abbc07a921adf1df5" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "ecf27a574f7d4a70a40be14ee6471084c82fc617cef57199bdb72ab9528ecc5e" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 00000000..34fb0512 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,29 @@ +# Gopkg.toml example +# +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" + + +[[constraint]] + branch = "master" + name = "github.com/aandryashin/matchers" + +[[constraint]] + name = "github.com/docker/go-units" + version = "0.3.2" diff --git a/docs/contributing.adoc b/docs/contributing.adoc index ff9b1770..9b347492 100644 --- a/docs/contributing.adoc +++ b/docs/contributing.adoc @@ -6,17 +6,17 @@ To build Selenoid: . Setup `$GOPATH` https://github.com/golang/go/wiki/GOPATH[properly] -. Install https://github.com/kardianos/govendor[govendor] - - $ go get -u github.com/kardianos/govendor - . Get Selenoid source: $ go get -d github.com/aerokube/selenoid +. Go to project directory: + + $ cd $GOPATH/src/github.com/aerokube/selenoid + . Checkout dependencies - $ cd $GOPATH/src/github.com/aerokube/selenoid && govendor sync + $ go get -u github.com/golang/dep/cmd/dep && dep ensure . Build source: diff --git a/vendor/vendor.json b/vendor/vendor.json deleted file mode 100644 index 3bc11d68..00000000 --- a/vendor/vendor.json +++ /dev/null @@ -1,247 +0,0 @@ -{ - "comment": "", - "ignore": "test", - "package": [ - { - "checksumSHA1": "ooqO8TYkju/OcDsg9jxZq8jjbWI=", - "path": "github.com/Microsoft/go-winio", - "revision": "f3b1913901892ada21d52d0cffe1d4c7080d36b7", - "revisionTime": "2017-04-26T02:53:07Z" - }, - { - "checksumSHA1": "m+iiamnbukzE8kFPfBche6D0FmQ=", - "path": "github.com/Sirupsen/logrus", - "revision": "5b60b3d3ee017ed00bcd0225fcca7acab767844b", - "revisionTime": "2017-05-04T07:10:19Z" - }, - { - "checksumSHA1": "dyP2N0QATuRGjYsl01c9YmiyU5k=", - "path": "github.com/aandryashin/matchers", - "revision": "435295ea180e58dbfa526db1ebab8c801b4c2b75", - "revisionTime": "2016-11-26T17:04:13Z" - }, - { - "checksumSHA1": "6hdqb2Z8iZf/1PcwVAC3e/m6n+E=", - "path": "github.com/aandryashin/matchers/httpresp", - "revision": "435295ea180e58dbfa526db1ebab8c801b4c2b75", - "revisionTime": "2016-11-26T17:04:13Z" - }, - { - "checksumSHA1": "Gj+xR1VgFKKmFXYOJMnAczC3Znk=", - "path": "github.com/docker/distribution/digestset", - "revision": "ce936a85915a55418ea62dc32a0a1274f2740104", - "revisionTime": "2017-05-05T18:45:43Z" - }, - { - "checksumSHA1": "2Fe4D6PGaVE2he4fUeenLmhC1lE=", - "path": "github.com/docker/distribution/reference", - "revision": "ce936a85915a55418ea62dc32a0a1274f2740104", - "revisionTime": "2017-05-05T18:45:43Z" - }, - { - "checksumSHA1": "xDSC47ijaStte3U4VnfyoAbb1rs=", - "path": "github.com/docker/docker/api", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "XRM8n6GhEuZMchTMF+LmzVzMMlE=", - "path": "github.com/docker/docker/api/types", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "jVJDbe0IcyjoKc2xbohwzQr+FF0=", - "path": "github.com/docker/docker/api/types/blkiodev", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "m+f+oarn+CwS4n4ibTDFytUnimw=", - "path": "github.com/docker/docker/api/types/container", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "fzeGodcTcWuV18AT0BcvB4EFByo=", - "path": "github.com/docker/docker/api/types/events", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "J2OKngfI3vgswudr9PZVUFcRRu0=", - "path": "github.com/docker/docker/api/types/filters", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "yeB781yxPhnN6OXQ9/qSsyih3ek=", - "path": "github.com/docker/docker/api/types/image", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "UK+VdM648oWzyqE4OqttgmPqjoA=", - "path": "github.com/docker/docker/api/types/mount", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "oC2We2SzAYMULIfr7fXaoofnF+c=", - "path": "github.com/docker/docker/api/types/network", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "93qfc2M61FdF62qeGXZHWpVSK8k=", - "path": "github.com/docker/docker/api/types/registry", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "VTxWyFud/RedrpllGdQonVtGM/A=", - "path": "github.com/docker/docker/api/types/strslice", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "Oc618nKdI/c7bYPw1hHtg7JpMto=", - "path": "github.com/docker/docker/api/types/swarm", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "B7ZwKzrv3t3Vlox6/bYMHhMjsM8=", - "path": "github.com/docker/docker/api/types/time", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "uDPQ3nHsrvGQc9tg/J9OSC4N5dQ=", - "path": "github.com/docker/docker/api/types/versions", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "IBJy2zPEnYmcFJ3lM1eiRWnCxTA=", - "path": "github.com/docker/docker/api/types/volume", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "UQQxpH8UschstMO90In2QDEUIZ4=", - "path": "github.com/docker/docker/client", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "5qccCXTTyEBj19AxaIgfTjNPdaU=", - "path": "github.com/docker/docker/pkg/ioutils", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "ndnAFCfsGC3upNQ6jAEwzxcurww=", - "path": "github.com/docker/docker/pkg/longpath", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "SXjPQfi84j+BFZi4Fl1c/OC/f7M=", - "path": "github.com/docker/docker/pkg/system", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "8I0Ez+aUYGpsDEVZ8wN/Ztf6Zqs=", - "path": "github.com/docker/docker/pkg/tlsconfig", - "revision": "7ca86796c94c7ae0c62680ac664f97ab5f35ebec", - "revisionTime": "2017-05-05T22:16:13Z" - }, - { - "checksumSHA1": "JbiWTzH699Sqz25XmDlsARpMN9w=", - "path": "github.com/docker/go-connections/nat", - "revision": "e15c02316c12de00874640cd76311849de2aeed5", - "revisionTime": "2017-03-31T14:51:22Z" - }, - { - "checksumSHA1": "jUfDG3VQsA2UZHvvIXncgiddpYA=", - "path": "github.com/docker/go-connections/sockets", - "revision": "e15c02316c12de00874640cd76311849de2aeed5", - "revisionTime": "2017-03-31T14:51:22Z" - }, - { - "checksumSHA1": "tuSzlS1UQ03+5Fvtqr5hI5sLLhA=", - "path": "github.com/docker/go-connections/tlsconfig", - "revision": "e15c02316c12de00874640cd76311849de2aeed5", - "revisionTime": "2017-03-31T14:51:22Z" - }, - { - "checksumSHA1": "UmXGieuTJQOzJPspPJTVKKKMiUA=", - "path": "github.com/docker/go-units", - "revision": "0dadbb0345b35ec7ef35e228dabb8de89a65bf52", - "revisionTime": "2017-01-27T09:51:30Z" - }, - { - "checksumSHA1": "sNAU9ojYVUhO6dVXey6T3JhRQpw=", - "path": "github.com/docker/libtrust", - "revision": "aabc10ec26b754e797f9028f4589c5b7bd90dc20", - "revisionTime": "2016-07-08T17:25:13Z" - }, - { - "checksumSHA1": "qj7IAU2RRq99oaIEGH0eLfX/UcM=", - "path": "github.com/opencontainers/go-digest", - "revision": "aa2ec055abd10d26d539eb630a92241b781ce4bc", - "revisionTime": "2017-01-31T01:35:07Z" - }, - { - "checksumSHA1": "Se195FlZ160eaEk/uVx4KdTPSxU=", - "path": "github.com/pborman/uuid", - "revision": "1b00554d822231195d1babd97ff4a781231955c9", - "revisionTime": "2017-01-12T15:04:04Z" - }, - { - "checksumSHA1": "rJab1YdNhQooDiBWNnt7TLWPyBU=", - "path": "github.com/pkg/errors", - "revision": "c605e284fe17294bda444b34710735b29d1a9d90", - "revisionTime": "2017-05-05T04:36:39Z" - }, - { - "checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=", - "path": "golang.org/x/net/context", - "revision": "feeb485667d1fdabe727840fe00adc22431bc86e", - "revisionTime": "2017-05-02T17:39:58Z" - }, - { - "checksumSHA1": "WHc3uByvGaMcnSoI21fhzYgbOgg=", - "path": "golang.org/x/net/context/ctxhttp", - "revision": "feeb485667d1fdabe727840fe00adc22431bc86e", - "revisionTime": "2017-05-02T17:39:58Z" - }, - { - "checksumSHA1": "fjMK2G5arnjllpoeBYeyf9Y2Iok=", - "path": "golang.org/x/net/proxy", - "revision": "feeb485667d1fdabe727840fe00adc22431bc86e", - "revisionTime": "2017-05-02T17:39:58Z" - }, - { - "checksumSHA1": "7EZyXN0EmZLgGxZxK01IJua4c8o=", - "path": "golang.org/x/net/websocket", - "revision": "feeb485667d1fdabe727840fe00adc22431bc86e", - "revisionTime": "2017-05-02T17:39:58Z" - }, - { - "checksumSHA1": "IawG7xjKYf2JnFsj+3unrFidmJU=", - "path": "golang.org/x/sys/unix", - "revision": "9ccfe848b9db8435a24c424abbc07a921adf1df5", - "revisionTime": "2017-04-27T03:54:25Z" - }, - { - "checksumSHA1": "9YX4DNBhOM8krIjoT9eT2fnh1G0=", - "path": "golang.org/x/sys/windows", - "revision": "9ccfe848b9db8435a24c424abbc07a921adf1df5", - "revisionTime": "2017-04-27T03:54:25Z" - } - ], - "rootPath": "github.com/aerokube/selenoid" -}