Version the tarball uploaded to s3 and tell the next step about it.

Signed-off-by: Tom Wilkie <tom.wilkie@gmail.com>

.circleci/config.yml

@@ -183,16 +183,21 @@ jobs:
           command: 'sudo pip install awscli'
           command: 'sudo pip install awscli'
       - run:
       - run:
           name: deploy to s3
           name: deploy to s3
-          command: 'aws s3 sync ./dist s3://$BUCKET_NAME/master'
+          command: |
+            # Also
+            cp dist/grafana-latest.linux-x64.tar.gz dist/grafana-master-${CIRCLE_SHA1:7}.linux-x64.tar.gz
+            aws s3 sync ./dist s3://$BUCKET_NAME/master
       - run:
       - run:
           name: Trigger Windows build
           name: Trigger Windows build
           command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
           command: './scripts/trigger_windows_build.sh ${APPVEYOR_TOKEN} ${CIRCLE_SHA1} master'
       - run:
       - run:
           name: Trigger Docker build
           name: Trigger Docker build
-          command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN}'
+          command: './scripts/trigger_docker_build.sh ${TRIGGER_GRAFANA_PACKER_CIRCLECI_TOKEN} master-${CIRCLE_SHA1:7}'
       - run:
       - run:
           name: Publish to Grafana.com
           name: Publish to Grafana.com
-          command: './scripts/publish -apiKey ${GRAFANA_COM_API_KEY}'
+          command: |
+            rm dist/grafana-master-${CIRCLE_SHA1:7}.linux-x64.tar.gz
+            ./scripts/publish -apiKey ${GRAFANA_COM_API_KEY}
 
 
   deploy-release:
   deploy-release:
     docker:
     docker:
@@ -240,9 +245,9 @@ workflows:
             - gometalinter
             - gometalinter
             - mysql-integration-test
             - mysql-integration-test
             - postgres-integration-test
             - postgres-integration-test
-          filters:
-            branches:
-              only: master
+          #filters:
+          #  branches:
+          #    only: master
   release:
   release:
     jobs:
     jobs:
       - build-all:
       - build-all:

scripts/trigger_docker_build.sh

@@ -3,7 +3,7 @@
 _circle_token=$1
 _circle_token=$1
 _grafana_version=$2
 _grafana_version=$2
 
 
-trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-docker/tree/master?circle-token=${_circle_token}
+trigger_build_url=https://circleci.com/api/v1/project/grafana/grafana-docker/tree/deploy?circle-token=${_circle_token}
 
 
 post_data=$(cat <<EOF
 post_data=$(cat <<EOF
 {
 {