Now that Frey deploys via Travis are working, only do it on tags, and after release

This commit is contained in:
Kevin van Zonneveld 2016-03-29 19:41:44 +02:00
parent f0f16865a9
commit 603fce7559
1 changed files with 4 additions and 3 deletions

View File

@ -29,8 +29,6 @@ before_deploy:
- go get github.com/laher/goxc - go get github.com/laher/goxc
- goxc -t -bc="linux darwin windows" - goxc -t -bc="linux darwin windows"
- goxc -d=./ -wd=./cmd/tusd -bc="linux darwin windows" -build-ldflags="-X main.VersionName=$TRAVIS_TAG -X main.GitCommit=$TRAVIS_COMMIT -X 'main.BuildDate=$(date --utc)'" - goxc -d=./ -wd=./cmd/tusd -bc="linux darwin windows" -build-ldflags="-X main.VersionName=$TRAVIS_TAG -X main.GitCommit=$TRAVIS_COMMIT -X 'main.BuildDate=$(date --utc)'"
- .infra/scripts/rebuild-env.sh
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then (make frey && frey setup --force-yes --projectDir .infra); else echo "Skipping deploy fornon-master/PRs"; fi
deploy: deploy:
provider: releases provider: releases
api_key: api_key:
@ -48,6 +46,9 @@ deploy:
- snapshot/tusd_windows_amd64.zip - snapshot/tusd_windows_amd64.zip
skip_cleanup: true skip_cleanup: true
on: on:
# tags: true tags: true
go: 1.5 go: 1.5
repo: tus/tusd repo: tus/tusd
after_deploy:
- .infra/scripts/rebuild-env.sh
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then (make frey && frey setup --force-yes --projectDir .infra); else echo "Skipping deploy for non-master/PRs"; fi