From db1950f6810ff626b6a9f970b466ea46bad9e0cc Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Tue, 13 Apr 2021 01:15:51 -0700 Subject: [PATCH] Add packagecloud integration, remove JFrog --- .gitignore | 1 + .secret-files.tar.enc | Bin 17936 -> 0 bytes .secret_files.tar.enc | Bin 0 -> 15888 bytes .travis.yml | 54 ++++++++++++++++++++++++++++-------- Makefile | 18 ++++++------ README.md | 2 +- gpg.public.key | 51 ---------------------------------- init/docker/hooks/build | 2 -- init/docker/hooks/pre_build | 2 -- scripts/package-deploy.sh | 33 ---------------------- settings.sh | 6 ++++ 11 files changed, 59 insertions(+), 110 deletions(-) delete mode 100644 .secret-files.tar.enc create mode 100644 .secret_files.tar.enc delete mode 100644 gpg.public.key delete mode 100755 scripts/package-deploy.sh diff --git a/.gitignore b/.gitignore index 9ce67d3d..03d3b14c 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ github_deploy_key* .metadata.make /after-install-rendered.sh /before-remove-rendered.sh +/gpg.signing.key diff --git a/.secret-files.tar.enc b/.secret-files.tar.enc deleted file mode 100644 index 1248256dc6562b417c54ae7b69e49626b43e61d2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17936 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­oQ%gKAJAgQH#-_tSo>r#d{^Q;40JAzRI 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 L)9ArHK!nfsL7?+4 diff --git a/.secret_files.tar.enc b/.secret_files.tar.enc new file mode 100644 index 0000000000000000000000000000000000000000..af3b5b61cc9f4c5a8a1dbd65a09346e330082b3f GIT binary patch literal 15888 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 literal 0 HcmV?d00001 diff --git a/.travis.yml b/.travis.yml index d122b054..f6bc4ed9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,12 +26,11 @@ 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 before_script: - - gpg --import gpg.public.key # Create your own deploy key, tar it, and encrypt the file to make this work. Optionally add a bitly_token file to the archive. - - openssl aes-256-cbc -K $encrypted_9f3147001275_key -iv $encrypted_9f3147001275_iv -in .secret-files.tar.enc -out .secret-files.tar -d - - tar -xf .secret-files.tar - - gpg --batch --yes --import gpg.signing.key - - rm -f gpg.signing.key .secret-files.tar + - openssl aes-256-cbc -K $encrypted_772fc4772f04_key -iv $encrypted_772fc4772f04_iv -in .secret_files.tar.enc -out .secret_files.tar -d + - tar -xf .secret_files.tar + - gpg --import gpg.signing.key + - rm -f gpg.signing.key .secret_files.tar - source settings.sh script: # Test Go and Docker. @@ -59,6 +58,44 @@ after_success: " StrictHostKeyChecking no" \ " LogLevel ERROR" >> $HOME/.ssh/config) deploy: + - provider: packagecloud + repository: "pkgs" + username: "golift" + token: + secure: "1vzsIxgcDkMkkmxpvaw3vEMt4cbDNpk3UMeiv5qnHJ9/k0D6+VhNVS0I3QLgP5+WQgH11Y0YX00NvcY13M+hSj6vLhPCBroFisXJyDpg/f/bxyHxILFeO6AY/CSFbdLzyLcjJo5SC7JedEhqd4xeqjEo14FxGrzKB7guOBCdOQPtaFxfimm02vNt34LoLGYOfZMek2vt50qAR8ChvX2fG/gGxfAlQ4AYvppJLwfPs4jwMN1rrndDI1EUgy3ZMafM40KguXD2wGkctLmyoelTEX2TEDa8TBZKot3lRmK1vyI3wCzNY/Jb5chGq9J5zWFpPlSvn+NPeqj+8UGCZ+bCb0unFH5OdOEKTmQ46cYgL6d3RRbpwoxbG/twg/bAfJ0iiSNTJfXjXDLKT9j+YyeCerbnh7rT/qCuwO+W/HIsnu0waCXvXGAKXGAAE+xvnBygp/YS6I4Y26V2CBIF8KJEWIF/CuooHzraa5c1hg50h5YZnZ9EwVXxFRdsFSNxle9uNe2iJ08FEV6VyHPybYsOnA37yM7E8wCLbcKRKavAyVT7OykLU2GAAOCdcN8tpSDA/kwKx3imZhyjGGUrYQxVN/bCb4hhBX+OymcVIw2gQFkJ/sc09ck+Vo77FVR6JVi0tCjan7x4oCTQfbEa5lkioMjKgY6JDfRVZdX6HUjlJTw=" + dist: "ubuntu/focal" + local-dir: release + package_glob: "*.deb" + skip_cleanup: true + cleanup: false + on: + tags: true + - provider: packagecloud + repository: "pkgs" + username: "golift" + token: + secure: "1vzsIxgcDkMkkmxpvaw3vEMt4cbDNpk3UMeiv5qnHJ9/k0D6+VhNVS0I3QLgP5+WQgH11Y0YX00NvcY13M+hSj6vLhPCBroFisXJyDpg/f/bxyHxILFeO6AY/CSFbdLzyLcjJo5SC7JedEhqd4xeqjEo14FxGrzKB7guOBCdOQPtaFxfimm02vNt34LoLGYOfZMek2vt50qAR8ChvX2fG/gGxfAlQ4AYvppJLwfPs4jwMN1rrndDI1EUgy3ZMafM40KguXD2wGkctLmyoelTEX2TEDa8TBZKot3lRmK1vyI3wCzNY/Jb5chGq9J5zWFpPlSvn+NPeqj+8UGCZ+bCb0unFH5OdOEKTmQ46cYgL6d3RRbpwoxbG/twg/bAfJ0iiSNTJfXjXDLKT9j+YyeCerbnh7rT/qCuwO+W/HIsnu0waCXvXGAKXGAAE+xvnBygp/YS6I4Y26V2CBIF8KJEWIF/CuooHzraa5c1hg50h5YZnZ9EwVXxFRdsFSNxle9uNe2iJ08FEV6VyHPybYsOnA37yM7E8wCLbcKRKavAyVT7OykLU2GAAOCdcN8tpSDA/kwKx3imZhyjGGUrYQxVN/bCb4hhBX+OymcVIw2gQFkJ/sc09ck+Vo77FVR6JVi0tCjan7x4oCTQfbEa5lkioMjKgY6JDfRVZdX6HUjlJTw=" + dist: "el/6" + local-dir: release + package_glob: "*.rpm" + skip_cleanup: true + cleanup: false + on: + tags: true + - provider: releases + token: + # to get a secure api key, run: travis setup releases + # make a copy of this file first because that command will change it. + # or: make a new key manually at https://github.com/settings/tokens/new + # then: echo | travis encrypt + secure: "CEeczHbmPCs54puNInkE7pCwPrR13Rl054PVtfElsXGD62DoJB6DAW2M9XEEVQPAaCZHj8K1mTRKA6h0W1xSyT0YYZkcVRzrpqkntGo1swfRtPj3nnUCJEqvABrMJWv7c/145LmcoXpalxMCHVOioQJO87hZf+iV+Keb2HwIUTChglVpjcDtTeSrQlKSn58jiYSaVQs4cgdrXhlBFxTwgeyVBTbbg7nU036GgCnQoU9gzWZysa6XGuO4MyoehRfNj5RHIbPITWqmUSbxUHV4G25+SrcP2MBEdZawvWKSrnSvKdYuczhmhv9rVIxNNOM+jRqIpLlaJjY+o1kWL9OBT/e9eqyfpvG7b1sYWyuzQPPNH02hV5NyXLobXtWDpuL8gCbtF/dLTjsom2PGC/g0/aeJ0GvwmSA/c2P8Oc2AajHX9kJ9JSq1R7Kg0JKHFZRwsdUb1sfoc2oyO9sh7YpMDx/6eVnkTekbhpXLdJyJd4pWj6FLllZP6GMVQehyOUANADKZQ1yWH+gPUbgvieEjd54ZqZO5/yPzOI0eIw9j48BCMRgjkY5wZkUJ+lLjN5qMS5Zrc4rSI4kU0UKrvvr9O32EczV6f54lRxp9TK89NuPkkcbCAWa9iVasdONOho5TRKRirp3W3jqWm2rSbKWjPg9axJ2ts53I8w8ybMdyFRE=" + overwrite: true + skip_cleanup: true + cleanup: false + file_glob: true + file: release/* + on: + tags: true - provider: releases api_key: secure: GsvW0m+EnRELQMk8DjH63VXinqbwse4FJ4vNUslOE6CZ8PBXPrH0ZgaI7ic/uxRtm7CYj0sir4CZq62W5l6uhoXCCQfjOnmJspqnQcrFZ1xRdWktsNXaRwM6hlzaUThsJ/1PD9Psc66uKXBYTg0IlUz0yjZAZk7tCUE4libuj41z40ZKxUcbfcNvH4Njc9IpNB4QSA3ss+a9/6ZwBz4tHVamsGIrzaE0Zf99ItNBYvaOwhM2rC/NWIsFmwt8w4rIA2NIrkZgMDV+Z2Niqh4JRLAWCQNx/RjC5U52lG2yhqivUC3TromZ+q4O4alUltsyIzF2nVanLWgJmbeFo8uXT5A+gd3ovSkFLU9medXd9i4kap7kN/o5m9p5QZvrdEYHEmIU4ml5rjT2EQQVy5CtSmpiRAbhpEJIvA1wDtRq8rdz8IVfJXkHNjg2XdouNmMMWqa3OkEPw21+uxsqv4LscW/6ZjsavzL5SSdnBRU9n79EfGJE/tJLKiNumah/vLuJ5buNhgqmCdtX/Tg+DhQS1BOyYg4l4L8s9IIKZgFRwrOPsZnA/KsrWg4ZsjJ87cqKCaT/qs2EJx5odZcZWJYLBngeO8Tc6cQtLgJdieY2oEKo51Agq4rgikZDt21m6TY9/R5lPN0piwdpy3ZGKfv1ijXx74raMT03qskputzMCvc= @@ -73,10 +110,3 @@ deploy: script: scripts/formula-deploy.sh on: tags: true - - provider: script - script: scripts/package-deploy.sh - skip_cleanup: true - cleanup: false - on: - all_branches: true - condition: $TRAVIS_BRANCH =~ ^(master|v[0-9.]+)$ diff --git a/Makefile b/Makefile index 9dffdb46..8e0de7cb 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ IGNORED:=$(shell bash -c "source settings.sh ; env | grep -v BASH_FUNC | sed 's/=/:=/;s/^/export /' > .metadata.make") # md2roff turns markdown into man files and html files. -MD2ROFF_BIN=github.com/davidnewhall/md2roff +MD2ROFF_BIN=github.com/davidnewhall/md2roff@v0.0.1 # rsrc adds an ico file to a Windows exe file. RSRC_BIN=github.com/akavel/rsrc @@ -201,49 +201,49 @@ rpm: $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm: package_build_linux check_fpm @echo "Building 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a x86_64 -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm @echo "Building 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." fpm -s dir -t deb $(PACKAGE_ARGS) -a amd64 -v $(VERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb; expect -exact \"Enter passphrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb rpm386: $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm: package_build_linux_386 check_fpm @echo "Building 32-bit 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a i386 -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm deb386: $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm @echo "Building 32-bit 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." fpm -s dir -t deb $(PACKAGE_ARGS) -a i386 -v $(VERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb; expect -exact \"Enter passphrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb rpmarm: $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm: package_build_linux_arm64 check_fpm @echo "Building 64-bit ARM8 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a arm64 -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm debarm: $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm @echo "Building 64-bit ARM8 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." fpm -s dir -t deb $(PACKAGE_ARGS) -a arm64 -v $(VERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb; expect -exact \"Enter passphrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb rpmarmhf: $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm: package_build_linux_armhf check_fpm @echo "Building 32-bit ARM6/7 HF 'rpm' package for $(BINARY) version '$(RPMVERSION)-$(ITERATION)'." fpm -s dir -t rpm $(PACKAGE_ARGS) -a armhf -v $(RPMVERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --resign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm debarmhf: $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm @echo "Building 32-bit ARM6/7 HF 'deb' package for $(BINARY) version '$(VERSION)-$(ITERATION)'." fpm -s dir -t deb $(PACKAGE_ARGS) -a armhf -v $(VERSION) -C $< - [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb; expect -exact \"Enter passphrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb freebsd_pkg: $(BINARY)-$(VERSION)_$(ITERATION).amd64.txz $(BINARY)-$(VERSION)_$(ITERATION).amd64.txz: package_build_freebsd check_fpm diff --git a/README.md b/README.md index 9ea920eb..f005de6b 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ integrations are used for things like storage, building, compiling, distribution documentation support. This project succeeds because of them. Thank you!

- + diff --git a/gpg.public.key b/gpg.public.key deleted file mode 100644 index ccf38d7b..00000000 --- a/gpg.public.key +++ /dev/null @@ -1,51 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -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 -=Ej9Z ------END PGP PUBLIC KEY BLOCK----- diff --git a/init/docker/hooks/build b/init/docker/hooks/build index 85bc7125..0c3d7763 100755 --- a/init/docker/hooks/build +++ b/init/docker/hooks/build @@ -4,8 +4,6 @@ # This is part of Application Builder. # https://github.com/golift/application-builder -set -e -o pipefail - # This always run local to the Dockerfile folder, so the path is ../.. pushd ../.. diff --git a/init/docker/hooks/pre_build b/init/docker/hooks/pre_build index e77de974..9be7c600 100755 --- a/init/docker/hooks/pre_build +++ b/init/docker/hooks/pre_build @@ -9,6 +9,4 @@ # set `DOCKER_CLI_EXPERIMENTAL=enabled` in your build environment. # See README.md (in this dir) and the screenshot for more info. -apt-get -y update -apt-get -y --only-upgrade install docker-ee docker run --rm --privileged multiarch/qemu-user-static:register --reset diff --git a/scripts/package-deploy.sh b/scripts/package-deploy.sh deleted file mode 100755 index 3a01ffe0..00000000 --- a/scripts/package-deploy.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 diff --git a/settings.sh b/settings.sh index 1e8f264f..26644a24 100755 --- a/settings.sh +++ b/settings.sh @@ -30,3 +30,9 @@ SOURCE_PATH=https://golift.io/${BINARY}/archive/v${VERSION}.tar.gz export BINARY HBREPO MAINT VENDOR DESC GOLANGCI_LINT_ARGS CONFIG_FILE export LICENSE FORMULA SOURCE_URL VERSION_PATH SOURCE_PATH + +### Optional ### + +# Import this signing key only if it's in the keyring. +gpg --list-keys 2>/dev/null | grep -q B93DD66EF98E54E2EAE025BA0166AD34ABC5A57C +[ "$?" != "0" ] || export SIGNING_KEY=B93DD66EF98E54E2EAE025BA0166AD34ABC5A57C