From 0548b821eb09c927acc6ba6df1270b723f45278b Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 11 Dec 2019 23:04:59 -0800 Subject: [PATCH 1/3] add bintray support --- core/poller/scripts/package-jfrog.sh | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100755 core/poller/scripts/package-jfrog.sh diff --git a/core/poller/scripts/package-jfrog.sh b/core/poller/scripts/package-jfrog.sh new file mode 100755 index 00000000..c814b264 --- /dev/null +++ b/core/poller/scripts/package-jfrog.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +# Deploy our built packages to jfrog bintray. + +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 + +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 From 7b0c48d33a7b270b1fdbb897efb730a5072e6636 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 11 Dec 2019 23:44:35 -0800 Subject: [PATCH 2/3] remove exit --- core/poller/scripts/package-jfrog.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/core/poller/scripts/package-jfrog.sh b/core/poller/scripts/package-jfrog.sh index c814b264..f5cce468 100755 --- a/core/poller/scripts/package-jfrog.sh +++ b/core/poller/scripts/package-jfrog.sh @@ -21,7 +21,6 @@ for os in el centos; do done done - for os in ubuntu debian; do for arch in arm64 armhf amd64 i386; do file="unifi-poller_${VERSION}-${ITERATION}_${arch}.deb" From cb1925622224005220d9a539dc6f0eea9ace6de5 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 12 Dec 2019 00:21:41 -0800 Subject: [PATCH 3/3] replace packagecloud --- core/poller/.travis.yml | 3 +- core/poller/README.md | 15 ++++----- core/poller/scripts/package-deploy.sh | 44 +++++++++++++++++---------- core/poller/scripts/package-jfrog.sh | 33 -------------------- 4 files changed, 37 insertions(+), 58 deletions(-) delete mode 100755 core/poller/scripts/package-jfrog.sh diff --git a/core/poller/.travis.yml b/core/poller/.travis.yml index 219a73c0..6a71c421 100644 --- a/core/poller/.travis.yml +++ b/core/poller/.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/core/poller/README.md b/core/poller/README.md index deae98bc..ca07e6d5 100644 --- a/core/poller/README.md +++ b/core/poller/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/core/poller/scripts/package-deploy.sh b/core/poller/scripts/package-deploy.sh index 5c86884d..60758dc0 100755 --- a/core/poller/scripts/package-deploy.sh +++ b/core/poller/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 diff --git a/core/poller/scripts/package-jfrog.sh b/core/poller/scripts/package-jfrog.sh deleted file mode 100755 index f5cce468..00000000 --- a/core/poller/scripts/package-jfrog.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash - -# Deploy our built packages to jfrog bintray. - -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 - -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