Merge branch 'master' into s3

This commit is contained in:
Marius 2016-01-16 16:14:13 +01:00
commit 82e29becc4
1 changed files with 3 additions and 2 deletions

View File

@ -4,7 +4,7 @@ go:
- 1.3
- 1.4
- 1.5
- 1.6
- 1.6beta1
- tip
sudo: false
@ -25,6 +25,7 @@ script:
- go test $PACKAGES
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"
@ -48,5 +49,5 @@ deploy:
on:
tags: true
go: 1.4
go: 1.5
repo: tus/tusd