diff --git a/circle.yml b/circle.yml index 1cc54393a1..1ceb8992e5 100644 --- a/circle.yml +++ b/circle.yml @@ -13,7 +13,6 @@ machine: 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_OLD: ../../../$HOME/.gvm/pkgsets/old/global/$BASE_DIR BASE_STABLE: ../../../$HOME/.gvm/pkgsets/stable/global/$BASE_DIR # Workaround Circle parsing dumb bugs and/or YAML wonkyness CIRCLE_PAIN: "mode: set" @@ -25,10 +24,6 @@ machine: dependencies: pre: # Copy the code to the gopath of all go versions - - > - gvm use old && - mkdir -p "$(dirname $BASE_OLD)" && - cp -R "$CHECKOUT" "$BASE_OLD" - > gvm use stable && mkdir -p "$(dirname $BASE_STABLE)" && @@ -36,9 +31,6 @@ dependencies: override: # Install dependencies for every copied clone/go version - - gvm use old && go get github.com/tools/godep: - pwd: $BASE_OLD - - gvm use stable && go get github.com/tools/godep: pwd: $BASE_STABLE @@ -50,7 +42,6 @@ dependencies: test: pre: # Output the go versions we are going to test - - gvm use old && go version - gvm use stable && go version # FMT @@ -66,11 +57,6 @@ test: pwd: $BASE_STABLE override: - # Test every version we have (but stable) - - gvm use old; godep go test -race -test.v -test.short ./...: - timeout: 600 - pwd: $BASE_OLD - # Test stable, and report # Preset the goverall report file - echo "$CIRCLE_PAIN" > ~/goverage.report