diff --git a/.travis.yml b/.travis.yml index 4f905f14..827c4edf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ before_install: - eval $(ssh-agent -s) - ssh-add github_deploy_key # Download the `dep` binary to bin folder in $GOPATH -- curl -sLo $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.3/dep-linux-amd64 +- curl -sLo $GOPATH/bin/dep https://github.com/golang/dep/releases/download/v0.5.3/dep-darwin-amd64 - chmod +x $GOPATH/bin/dep # download super-linter: golangci-lint - curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin latest @@ -32,7 +32,7 @@ deploy: overwrite: true skip_cleanup: true file_glob: true - file: build_assets/* + file: release/* on: repo: davidnewhall/unifi-poller tags: true diff --git a/Makefile b/Makefile index a59ca9a3..7898ba48 100644 --- a/Makefile +++ b/Makefile @@ -6,16 +6,16 @@ all: man unifi-poller # Prepare a release. Called in Travis CI. release: clean test man linux macos rpm deb osxpkg - mkdir -p build_assets + mkdir -p release gzip -9k unifi-poller.linux gzip -9k unifi-poller.macos - mv unifi-poller.macos.gz unifi-poller.linux.gz build_assets/ - cp *.rpm *.deb *.pkg build_assets/ + mv unifi-poller.macos.gz unifi-poller.linux.gz release/ + cp *.rpm *.deb *.pkg release/ clean: rm -f `echo $(PACKAGE)|cut -d/ -f3`{.macos,.linux,.1,}{,.gz} rm -f `echo $(PACKAGE)|cut -d/ -f3`{_,-}*.{deb,rpm,pkg} - rm -rf package_build build_assets + rm -rf package_build release build: unifi-poller unifi-poller: