From ae5b8ea8fc463ccb120a25fd43e28ba9f8e4d89f Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 26 Jan 2016 11:53:19 +0100 Subject: [PATCH 1/3] Simplify CircleCI configuration Signed-off-by: David Gageot --- circle.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/circle.yml b/circle.yml index 655f9bc2b7..1b2f1a9717 100644 --- a/circle.yml +++ b/circle.yml @@ -1,18 +1,13 @@ machine: pre: - # Install gvm - bash < <(curl -s -S -L https://raw.githubusercontent.com/moovweb/gvm/1.0.22/binscripts/gvm-installer) - # Install bats - - git clone https://github.com/sstephenson/bats.git && cd bats && sudo ./install.sh /usr/local post: - gvm install go1.5.3 -B --name=stable environment: - # Convenient shortcuts to "common" locations CHECKOUT: /home/ubuntu/$CIRCLE_PROJECT_REPONAME BASE_DIR: src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME - # Trick circle brainflat "no absolute path" behavior BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR dependencies: From 8f009cfe8c94c0b41d96dcd672ed8c634c2022d0 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 26 Jan 2016 15:13:02 +0100 Subject: [PATCH 2/3] Remove unused line Signed-off-by: David Gageot --- circle.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/circle.yml b/circle.yml index 1b2f1a9717..4009c3f6c3 100644 --- a/circle.yml +++ b/circle.yml @@ -19,7 +19,6 @@ dependencies: test: pre: - - gvm use stable && go version - gvm use stable && make build: pwd: $BASE_STABLE - gvm use stable && GO15VENDOREXPERIMENT=1 go get github.com/docker/docker-machine-driver-ci-test From ee9389e98c19375bfaebf6fadb933e7a2a25689e Mon Sep 17 00:00:00 2001 From: David Gageot Date: Tue, 26 Jan 2016 15:13:10 +0100 Subject: [PATCH 3/3] Remove duplication Signed-off-by: David Gageot --- circle.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/circle.yml b/circle.yml index 4009c3f6c3..ef2f49a44a 100644 --- a/circle.yml +++ b/circle.yml @@ -9,6 +9,7 @@ machine: CHECKOUT: /home/ubuntu/$CIRCLE_PROJECT_REPONAME BASE_DIR: src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR + GO15VENDOREXPERIMENT: 1 dependencies: override: @@ -21,9 +22,9 @@ test: pre: - gvm use stable && make build: pwd: $BASE_STABLE - - gvm use stable && GO15VENDOREXPERIMENT=1 go get github.com/docker/docker-machine-driver-ci-test + - gvm use stable && go get github.com/docker/docker-machine-driver-ci-test override: - - gvm use stable && PATH=../../../../bin:$PATH DRIVER=ci-test GO15VENDOREXPERIMENT=1 go test -v github.com/docker/machine/its/...: + - gvm use stable && PATH=../../../../bin:$PATH DRIVER=ci-test go test -v github.com/docker/machine/its/...: pwd: $BASE_STABLE timeout: 600