public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #12180 from grafana/deploy

Browse Source 
Propagate specific git-sha into tarball and docker builds
This commit is contained in:
Carl Bergquist
2018-06-08 13:02:07 +02:00
committed by GitHub
parent 77403b0dc1 484d9e3f9d
commit 38864d74bd
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+10 -5
View File
@@ -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-$(echo "${CIRCLE_SHA1}" | cut -b1-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-$(echo "${CIRCLE_SHA1}" | cut -b1-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-$(echo "${CIRCLE_SHA1}" | cut -b1-7).linux-x64.tar.gz
./scripts/publish -apiKey ${GRAFANA_COM_API_KEY}
deploy-release: deploy-release:
docker: docker:
@@ -241,8 +246,8 @@ workflows:
- mysql-integration-test - mysql-integration-test
- postgres-integration-test - postgres-integration-test
filters: filters:
branches: branches:
only: master only: master
release: release:
jobs: jobs:
- build-all: - build-all: