diff --git a/Makefile b/Makefile index 6ec414ad..50d3607a 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ BUILDVERSION=-ldflags "-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT RICE=$(GOPATH)/bin/rice PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH) PUBLISH_BODY='{ "request": { "branch": "master", "config": { "env": { "VERSION": "$(VERSION)", "COMMIT": "$(TRAVIS_COMMIT)" } } } }' -TRAVIS_BUILD_CMD='{ "os": [ "linux" ], "language": "go", "go": [ "1.10.x" ], "go_import_path": "github.com/hunterlong/statup", "install": true, "sudo": "required", "services": [ "docker" ], "env": { "global": [ "DB_HOST=localhost", "DB_USER=travis", "DB_PASS=", "DB_DATABASE=test", "GO_ENV=test", "STATUP_DIR=$GOPATH/src/github.com/hunterlong/statup" ] }, "matrix": { "allow_failures": [ { "go": "master" } ], "fast_finish": true }, "before_deploy": [ "git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "make tag" ], "deploy": [ { "provider": "releases", "api_key": "$GH_TOKEN", "file": [ "build/statup-osx-x64.tar.gz", "build/statup-osx-x32.tar.gz", "build/statup-linux-x64.tar.gz", "build/statup-linux-x32.tar.gz", "build/statup-linux-arm64.tar.gz", "build/statup-linux-arm7.tar.gz", "build/statup-linux-alpine.tar.gz", "build/statup-windows-x64.zip" ], "skip_cleanup": true } ], "notifications": { "email": false }, "before_script": [], "script": [ "if [[ \"$TRAVIS_BRANCH\" == \"master\" ]]; then travis_wait 30 docker pull karalabe/xgo-latest; fi", "if [[ \"$TRAVIS_BRANCH\" == \"master\" ]]; then make release; fi" ], "after_success": [], "after_deploy": [ "if [[ \"$TRAVIS_BRANCH\" == \"master\" ]]; then make publish-dev; fi" ] }' +TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "config": { "os": [ "linux" ], "language": "go", "go": [ "1.10.x" ], "go_import_path": "github.com/hunterlong/statup", "install": true, "sudo": "required", "services": [ "docker" ], "env": { "global": [ "VERSION=$(VERSION)", "COMMIT=$(TRAVIS_COMMIT)" ] }, "matrix": { "allow_failures": [ { "go": "master" } ], "fast_finish": true }, "before_deploy": [ "git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "make tag" ], "deploy": [ { "provider": "releases", "api_key": "$GH_TOKEN", "file": [ "build/statup-osx-x64.tar.gz", "build/statup-osx-x32.tar.gz", "build/statup-linux-x64.tar.gz", "build/statup-linux-x32.tar.gz", "build/statup-linux-arm64.tar.gz", "build/statup-linux-arm7.tar.gz", "build/statup-linux-alpine.tar.gz", "build/statup-windows-x64.zip" ], "skip_cleanup": true } ], "notifications": { "email": false }, "before_script": ["gem install sass"], "script": [ "travis_wait 30 docker pull karalabe/xgo-latest", "make release" ], "after_success": [], "after_deploy": [ "make publish-dev" ] } } }' TEST_DIR=$(GOPATH)/src/github.com/hunterlong/statup all: dev-deps compile install test-all @@ -86,7 +86,7 @@ databases: dep: dep ensure -dev-deps: +dev-deps: dep $(GOGET) github.com/stretchr/testify/assert $(GOGET) golang.org/x/tools/cmd/cover $(GOGET) github.com/mattn/goveralls