Move code-deploy to before release-deploy

This commit is contained in:
Kevin van Zonneveld 2016-03-29 15:17:15 +02:00
parent 1f7d84f202
commit 2d30a16ffc
1 changed files with 3 additions and 8 deletions

View File

@ -15,8 +15,7 @@ matrix:
allow_failures:
- go: tip
install:
- export PACKAGES=$(find ./ -maxdepth 1 -type d -not \( -name ".git" -or -name "cmd"
-or -name ".infra" -or -name "vendor" -or -name "data" -or -name ".hooks" \))
- export PACKAGES=$(find ./ -maxdepth 1 -type d -not \( -name ".git" -or -name "cmd" -or -name ".infra" -or -name "vendor" -or -name "data" -or -name ".hooks" \))
- rsync -r ./vendor/ $GOPATH/src
script:
- go test $PACKAGES
@ -24,8 +23,8 @@ before_deploy:
- export GOROOT_BOOTSTRAP=$GOROOT
- go get github.com/laher/goxc
- 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)'"
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then (make frey && frey setup --projectDir .infra); else echo "Skipping deploy fornon-master/PRs"; fi
deploy:
provider: releases
api_key:
@ -46,7 +45,3 @@ deploy:
# tags: true
go: 1.5
repo: tus/tusd
after_deploy:
- if [ "${TRAVIS_PULL_REQUEST}" == "false" ] && [ "${TRAVIS_BRANCH}" == "master" ];
then (make frey && frey setup --projectDir .infra) else echo "Skipping deploy for
non-master/PRs"; fi