vendoring

Financial-Times · Apr 19, 2017 · 0c8215b · 0c8215b
1 parent 2be816f
commit 0c8215b
Show file tree

Hide file tree

Showing 4 changed files with 178 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 *.iml
+*.exe
 .idea
-content-rw-elasticsearch
+content-rw-elasticsearch
+vendor/*/
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.7-alpine3.5
+FROM golang:1.8-alpine
 
 ENV PROJECT=content-rw-elasticsearch
 COPY . /${PROJECT}-sources/
@@ -19,7 +19,9 @@ RUN apk --no-cache --virtual .build-dependencies add git \
   && LDFLAGS="-X '"${BUILDINFO_PACKAGE}$VERSION"' -X '"${BUILDINFO_PACKAGE}$DATETIME"' -X '"${BUILDINFO_PACKAGE}$REPOSITORY"' -X '"${BUILDINFO_PACKAGE}$REVISION"' -X '"${BUILDINFO_PACKAGE}$BUILDER"'" \
   && echo "Build flags: $LDFLAGS" \
   && echo "Fetching dependencies..." \
-  && go get -t ./... \
+  && go get -u github.com/kardianos/govendor \
+  && $GOPATH/bin/govendor sync \
+  && go get -v \
   && go build -ldflags="${LDFLAGS}" \
   && mv ${PROJECT} /${PROJECT} \
   && apk del .build-dependencies \

diff --git a/circle.yml b/circle.yml
@@ -1,13 +1,27 @@
+machine:
+  environment:
+    GOPATH: "${HOME}/.go_workspace:/usr/local/go_workspace:${HOME}/.go_project"
+    GO_PROJECT_PATH: "${HOME}/.go_project/src/github.com/${CIRCLE_PROJECT_USERNAME}/${CIRCLE_PROJECT_REPONAME}"
+
+checkout:
+  post:
+    - mkdir -p $(dirname ${GO_PROJECT_PATH})
+    - ln -fs $HOME/$CIRCLE_PROJECT_REPONAME $GO_PROJECT_PATH
+
 dependencies:
   pre:
-    - go get github.com/axw/gocov/gocov; go get github.com/matm/gocov-html; go get -u github.com/jstemmer/go-junit-report
+    - go get -u github.com/kardianos/govendor
+  override:
+    - cd $GO_PROJECT_PATH && govendor sync
+    - cd $GO_PROJECT_PATH && go build -v
 test:
   pre:
+    - go get -u github.com/jstemmer/go-junit-report
     - go get github.com/mattn/goveralls
   override:
     - mkdir -p $CIRCLE_TEST_REPORTS/golang
-    - go test -race -v ./... | go-junit-report > $CIRCLE_TEST_REPORTS/golang/junit.xml
-    - go test -v -cover -race -coverprofile=$CIRCLE_ARTIFACTS/coverage.out ./...
+    - cd $GO_PROJECT_PATH && govendor test -race -v +local | go-junit-report > $CIRCLE_TEST_REPORTS/golang/junit.xml
+    - cd $GO_PROJECT_PATH && govendor list +local | awk -F/ '{ print $4}' | tr " " "\n" | xargs -I {} govendor test -v -cover -race -coverprofile=$CIRCLE_ARTIFACTS/{}.out ./{}
     - cd $CIRCLE_ARTIFACTS && sed -i '1d' *.out
     - |
       echo "mode: atomic" > $CIRCLE_ARTIFACTS/overall-coverage.result

diff --git a/vendor/vendor.json b/vendor/vendor.json
@@ -0,0 +1,154 @@
+{
+	"comment": "",
+	"ignore": "test",
+	"package": [
+		{
+			"checksumSHA1": "TVyK4buHhPUkpD0Pt9M7Zo2UAlI=",
+			"path": "github.com/Financial-Times/go-fthealth/v1_1",
+			"revision": "bc27ed19189994eef0364e4a07879d5a3f3be76f",
+			"revisionTime": "2017-03-24T12:21:32Z"
+		},
+		{
+			"checksumSHA1": "lBOK1zbqMz1rLNilYkkjPrjW+Qk=",
+			"path": "github.com/Financial-Times/http-handlers-go/httphandlers",
+			"revision": "bb69c454da9050fe1c4b92fe1345a01583ee70be",
+			"revisionTime": "2016-08-03T10:40:03Z"
+		},
+		{
+			"checksumSHA1": "6R+ptya8zWzpWfv27a9PdmH6uVo=",
+			"path": "github.com/Financial-Times/message-queue-gonsumer/consumer",
+			"revision": "4e173298922ba4c10721b1b5b3e0d35be7f162e9",
+			"revisionTime": "2017-03-20T10:34:32Z"
+		},
+		{
+			"checksumSHA1": "lQfsRf7gWYQDNoI3IOZuwNGUwRo=",
+			"path": "github.com/Financial-Times/service-status-go/buildinfo",
+			"revision": "3f5199736a3d7ae52394c63aac36834786825e21",
+			"revisionTime": "2016-03-23T11:15:42Z"
+		},
+		{
+			"checksumSHA1": "7QAsTdXi/6nTkDhqKy54YIc69d4=",
+			"path": "github.com/Financial-Times/service-status-go/gtg",
+			"revision": "3f5199736a3d7ae52394c63aac36834786825e21",
+			"revisionTime": "2016-03-23T11:15:42Z"
+		},
+		{
+			"checksumSHA1": "YxgjuCI4TJyfQujUeQk3V+gypzo=",
+			"path": "github.com/Financial-Times/service-status-go/httphandlers",
+			"revision": "3f5199736a3d7ae52394c63aac36834786825e21",
+			"revisionTime": "2016-03-23T11:15:42Z"
+		},
+		{
+			"checksumSHA1": "+Lyl4SYSRLQ7Hz2MNJlGKsmXL+8=",
+			"path": "github.com/Financial-Times/transactionid-utils-go",
+			"revision": "df2f00c734957c9dd651ce23ab0e0902504c7636",
+			"revisionTime": "2017-03-28T16:39:54Z"
+		},
+		{
+			"checksumSHA1": "NSJhlFlJwKJ90vd+jpwiXY/VYh0=",
+			"path": "github.com/Sirupsen/logrus",
+			"revision": "10f801ebc38b33738c9d17d50860f484a0988ff5",
+			"revisionTime": "2017-03-17T14:32:14Z"
+		},
+		{
+			"checksumSHA1": "DuEyF75v9xaKXfJsCPRdHNOpGZk=",
+			"origin": "github.com/stretchr/testify/vendor/github.com/davecgh/go-spew/spew",
+			"path": "github.com/davecgh/go-spew/spew",
+			"revision": "4d4bfba8f1d1027c4fdbe371823030df51419987",
+			"revisionTime": "2017-01-30T11:31:45Z"
+		},
+		{
+			"checksumSHA1": "CmsKJLZZkfiiiOI9MKkFv3XL+Mo=",
+			"path": "github.com/gorilla/mux",
+			"revision": "599cba5e7b6137d46ddf58fb1765f5d928e69604",
+			"revisionTime": "2017-02-28T22:43:54Z"
+		},
+		{
+			"checksumSHA1": "KJqRW8jfPoHquMAd6FI7x92JxFs=",
+			"path": "github.com/hashicorp/go-version",
+			"revision": "03c5bf6be031b6dd45afec16b1cf94fc8938bc77",
+			"revisionTime": "2017-02-02T08:07:59Z"
+		},
+		{
+			"checksumSHA1": "rW0QSLVB0eUCzMdIL7yigeLBQ54=",
+			"path": "github.com/jawher/mow.cli",
+			"revision": "d3ffbc2f98b83e09dc8efd55ecec75eb5fd656ec",
+			"revisionTime": "2017-02-20T22:51:54Z"
+		},
+		{
+			"checksumSHA1": "ZbvybRLthm+bve1duASQ5ghFl6Y=",
+			"path": "github.com/kr/pretty",
+			"revision": "cfb55aafdaf3ec08f0db22699ab822c50091b1c4",
+			"revisionTime": "2016-08-23T17:07:15Z"
+		},
+		{
+			"checksumSHA1": "OdjJhBQQtNpITIPc6X+C9e/6RLw=",
+			"path": "github.com/kr/text",
+			"revision": "7cafcd837844e784b526369c9bce262804aebc60",
+			"revisionTime": "2016-05-04T02:26:26Z"
+		},
+		{
+			"checksumSHA1": "+oyIJwPyeof36XCkY8awrNfxaNM=",
+			"origin": "github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib",
+			"path": "github.com/pmezard/go-difflib/difflib",
+			"revision": "4d4bfba8f1d1027c4fdbe371823030df51419987",
+			"revisionTime": "2017-01-30T11:31:45Z"
+		},
+		{
+			"checksumSHA1": "DIjooF5+DLH5JSOjqnBlfNh9dFU=",
+			"path": "github.com/rcrowley/go-metrics",
+			"revision": "1f30fe9094a513ce4c700b9a54458bbb0c96996c",
+			"revisionTime": "2016-11-28T21:05:44Z"
+		},
+		{
+			"checksumSHA1": "oNcjSQf1zGY27b9xipsqb2L4/RY=",
+			"path": "github.com/smartystreets/go-aws-auth",
+			"revision": "2043e6d0bb7e4c18464a7bba562acbe482e3cabd",
+			"revisionTime": "2016-07-22T04:48:03Z"
+		},
+		{
+			"checksumSHA1": "iDI3Ec9Co5dn9MAf6VRg5cGNRPI=",
+			"origin": "github.com/stretchr/testify/vendor/github.com/stretchr/objx",
+			"path": "github.com/stretchr/objx",
+			"revision": "4d4bfba8f1d1027c4fdbe371823030df51419987",
+			"revisionTime": "2017-01-30T11:31:45Z"
+		},
+		{
+			"checksumSHA1": "ziYrpyU5zo1q9+n1kaXqkR3kP2s=",
+			"path": "github.com/stretchr/testify/assert",
+			"revision": "4d4bfba8f1d1027c4fdbe371823030df51419987",
+			"revisionTime": "2017-01-30T11:31:45Z"
+		},
+		{
+			"checksumSHA1": "wjNVpZHpkT96ygOH5xN4rDfZdjE=",
+			"path": "github.com/stretchr/testify/mock",
+			"revision": "4d4bfba8f1d1027c4fdbe371823030df51419987",
+			"revisionTime": "2017-01-30T11:31:45Z"
+		},
+		{
+			"checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=",
+			"path": "golang.org/x/net/context",
+			"revision": "05d3205156cb1bdc096578d6457fa161cd950aa2",
+			"revisionTime": "2017-03-29T00:59:59Z"
+		},
+		{
+			"checksumSHA1": "lS6lXLd2ujduMzmQ8Z20Dt9QZyo=",
+			"path": "gopkg.in/olivere/elastic.v2",
+			"revision": "54283cb278d855e562a3d20f6c5afdbe1decf25b",
+			"revisionTime": "2017-03-29T06:52:08Z"
+		},
+		{
+			"checksumSHA1": "51/q8kpt63umcMuWOlTpKSUbnwM=",
+			"path": "gopkg.in/olivere/elastic.v2/backoff",
+			"revision": "54283cb278d855e562a3d20f6c5afdbe1decf25b",
+			"revisionTime": "2017-03-29T06:52:08Z"
+		},
+		{
+			"checksumSHA1": "jWlBRALwERf/Gv46hCYr3AdiIS0=",
+			"path": "gopkg.in/olivere/elastic.v2/uritemplates",
+			"revision": "54283cb278d855e562a3d20f6c5afdbe1decf25b",
+			"revisionTime": "2017-03-29T06:52:08Z"
+		}
+	],
+	"rootPath": "github.com/Financial-Times/content-rw-elasticsearch"
+}