From 3d6698389b5964aa83f8feda4e3a72b4f6ac69dd Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Tue, 24 Jan 2017 13:58:37 +0100
Subject: [PATCH] tech(build): adds s3 bucket for nightly

---
 circle.yml             | 4 ++--
 scripts/circle-test.sh | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/circle.yml b/circle.yml
index 25cf6f238c2..d154448612a 100644
--- a/circle.yml
+++ b/circle.yml
@@ -31,14 +31,14 @@ test:
 
 deployment:
   gh_branch:
-    branch: new_deploy
+    branch: master
     owner: grafana
     commands:
       - pip install awscli
       - ./scripts/build/build_container.sh
       - ./scripts/build/deploy.sh
       #- ./scripts/build/sign_packages.sh
-      #- aws s3 sync ./dist s3://$BUCKET_NAME
+        - aws s3 sync ./dist s3://$NIGHTLY_BUCKET_NAME
       #- ./scripts/trigger_grafana_docker_build.sh ${TRIGGER_GRAFANA_DOCKER_CIRCLECI_TOKEN}
   gh_tag:
     tag: /^v[0-9]+(\.[0-9]+){2}(-.+|[^-.]*)$/
diff --git a/scripts/circle-test.sh b/scripts/circle-test.sh
index 0087d9f8de3..39e04c4b4da 100755
--- a/scripts/circle-test.sh
+++ b/scripts/circle-test.sh
@@ -18,12 +18,8 @@ yarn install --pure-lockfile
 
 exit_if_fail npm test
 
-#test -z "$(gofmt -s -l ./pkg/... | tee /dev/stderr)"
 exit_if_fail test -z "$(gofmt -s -l ./pkg/... | tee /dev/stderr)"
-
-#exit_if_fail go run build.go setup
 exit_if_fail go run build.go build
-
 exit_if_fail go vet ./pkg/...
 exit_if_fail go test -v ./pkg/...