diff --git a/.travis.yml b/.travis.yml index 219a73c0..6a71c421 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,7 +27,6 @@ install: # 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 - rvm install 2.0.0 - - rvm 2.0.0 do gem install --no-document package_cloud - rvm 2.0.0 do gem install --no-document fpm before_script: - gpg --import gpg.public.key @@ -78,7 +77,7 @@ deploy: on: tags: true - provider: script - script: rvm 2.0.0 do scripts/package-deploy.sh + script: scripts/package-deploy.sh skip_cleanup: true on: all_branches: true diff --git a/README.md b/README.md index deae98bc..ca07e6d5 100644 --- a/README.md +++ b/README.md @@ -114,14 +114,15 @@ sites side-by-side. So easy! This screenshot barely does it justice. The following fine folks are providing their services, completely free! These service integrations are used for things like storage, building, compiling, distribution and documentation support. This project succeeds because of them. Thank you! +
## Copyright & License diff --git a/scripts/package-deploy.sh b/scripts/package-deploy.sh index 5c86884d..60758dc0 100755 --- a/scripts/package-deploy.sh +++ b/scripts/package-deploy.sh @@ -1,21 +1,33 @@ #!/bin/bash -# Deploy our built packages to packagecloud. +# Deploy our built packages to jfrog bintray. -REPO=unstable -[ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ] || REPO=stable -echo "deploying packages from branch: $TRAVIS_BRANCH, tag: $TRAVIS_TAG to repo: $REPO" +COMPONENT=unstable +if [ "$TRAVIS_BRANCH" != "$TRAVIS_TAG" ] && [ "$TRAVIS_BRANCH" != "" ]; then + COMPONENT=main +fi +echo "deploying packages from branch: $TRAVIS_BRANCH, tag: $TRAVIS_TAG to repo: $COMPONENT" source .metadata.sh -# deb -cmd="package_cloud push golift/${REPO}/ubuntu/bionic" -$cmd release/unifi-poller_${VERSION}-${ITERATION}_arm64.deb -$cmd release/unifi-poller_${VERSION}-${ITERATION}_amd64.deb -$cmd release/unifi-poller_${VERSION}-${ITERATION}_armhf.deb -$cmd release/unifi-poller_${VERSION}-${ITERATION}_i386.deb -# rpm -cmd="package_cloud push golift/${REPO}/el/6" -$cmd release/unifi-poller-${VERSION}-${ITERATION}.arm64.rpm -$cmd release/unifi-poller-${VERSION}-${ITERATION}.x86_64.rpm -$cmd release/unifi-poller-${VERSION}-${ITERATION}.armhf.rpm -$cmd release/unifi-poller-${VERSION}-${ITERATION}.i386.rpm + +for os in el centos; do + for arch in arm64 armhf x86_64 i386; do + file="unifi-poller-${VERSION}-${ITERATION}.${arch}.rpm" + opts="publish=1;override=1" + url="https://api.bintray.com/content/golift/${os}/unifi-poller/${VERSION}-${ITERATION}/${COMPONENT}/${arch}/${file}" + echo curl -T "release/${file}" "${url};${opts}" + curl -T "release/${file}" -u "${JFROG_USER_API_KEY}" "${url};${opts}" + echo + done +done + +for os in ubuntu debian; do + for arch in arm64 armhf amd64 i386; do + file="unifi-poller_${VERSION}-${ITERATION}_${arch}.deb" + opts="deb_distribution=xenial,bionic,focal,jesse,stretch,buster,bullseye;deb_component=${COMPONENT};deb_architecture=${arch};publish=1;override=1" + url="https://api.bintray.com/content/golift/${os}/unifi-poller/${VERSION}-${ITERATION}/${file}" + echo curl -T "release/${file}" "${url};${opts}" + curl -T "release/${file}" -u "${JFROG_USER_API_KEY}" "${url};${opts}" + echo + done +done