From c028bcbb60f2f5a5448721c2c3cdc28c6362e3c3 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Fri, 16 Dec 2016 00:10:09 +0100 Subject: [PATCH 1/5] circle.yml: go get --- circle.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/circle.yml b/circle.yml index 8d4e1c2dd..48a1c0c1e 100644 --- a/circle.yml +++ b/circle.yml @@ -8,6 +8,8 @@ dependencies: pre: - sudo pip install docker-compose - docker-compose -f docker-compose-integration.yml up -d --force-recreate + override: + - go get -d -v -t ./... test: override: From b0cecb4b803fc704f50b1d18d5730a003e4def3a Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Fri, 16 Dec 2016 00:14:20 +0100 Subject: [PATCH 2/5] circle.yml: integrate in post --- circle.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 48a1c0c1e..d2788fc75 100644 --- a/circle.yml +++ b/circle.yml @@ -8,11 +8,9 @@ dependencies: pre: - sudo pip install docker-compose - docker-compose -f docker-compose-integration.yml up -d --force-recreate - override: - - go get -d -v -t ./... test: - override: + post: - go test -v -race -tags integration ./...: environment: ETCD_ADDR: http://localhost:2379 From be17d10ccef3f2d58f597ed92103373ff6d2e04a Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Fri, 16 Dec 2016 00:23:48 +0100 Subject: [PATCH 3/5] circle.yml: explicitly qualify pkg --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index d2788fc75..e1abbb85f 100644 --- a/circle.yml +++ b/circle.yml @@ -11,7 +11,7 @@ dependencies: test: post: - - go test -v -race -tags integration ./...: + - go test -v -race -tags integration github.com/go-kit/kit/...: environment: ETCD_ADDR: http://localhost:2379 CONSUL_ADDR: localhost:8500 From e24728738d3b4afbda27fe23ba6034fc19155115 Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Fri, 16 Dec 2016 00:28:54 +0100 Subject: [PATCH 4/5] circle.yml: move stuff from service config to file --- circle.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/circle.yml b/circle.yml index e1abbb85f..d446266d7 100644 --- a/circle.yml +++ b/circle.yml @@ -10,6 +10,13 @@ dependencies: - docker-compose -f docker-compose-integration.yml up -d --force-recreate test: + pre: + - mkdir -p /home/ubuntu/.go_workspace/src/github.com/go-kit + - mv /home/ubuntu/kit /home/ubuntu/.go_workspace/src/github.com/go-kit + - go get github.com/go-kit/kit/... + override: + - go build github.com/go-kit/kit/... + - go test github.com/go-kit/kit/... post: - go test -v -race -tags integration github.com/go-kit/kit/...: environment: From 7113c99d19b5e08e8317346b4d3f25457e9dd14a Mon Sep 17 00:00:00 2001 From: Peter Bourgon Date: Fri, 16 Dec 2016 00:36:27 +0100 Subject: [PATCH 5/5] circle.yml: this One Weird Trick does everything anyway --- circle.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/circle.yml b/circle.yml index d446266d7..d5d6c70ad 100644 --- a/circle.yml +++ b/circle.yml @@ -15,9 +15,6 @@ test: - mv /home/ubuntu/kit /home/ubuntu/.go_workspace/src/github.com/go-kit - go get github.com/go-kit/kit/... override: - - go build github.com/go-kit/kit/... - - go test github.com/go-kit/kit/... - post: - go test -v -race -tags integration github.com/go-kit/kit/...: environment: ETCD_ADDR: http://localhost:2379