From cb00a81b67878e2a55872b9024f1d261448cec62 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 4 Dec 2019 00:51:30 -0800 Subject: [PATCH 01/20] dep --- Gopkg.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gopkg.lock b/Gopkg.lock index fbab23c4..08130d43 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -103,7 +103,7 @@ name = "golang.org/x/sys" packages = ["windows"] pruneopts = "UT" - revision = "6d18c012aee9febd81bbf9806760c8c4480e870d" + revision = "ce4227a45e2eb77e5c847278dcc6a626742e2945" [[projects]] digest = "1:87738e338f505d3e3be1f80d36b53f3c4e73be9b7ad4ccae46abbe9ef04f3f71" From b3641efeaefec881c95df8533071936bfcd877ff Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 4 Dec 2019 23:19:03 -0800 Subject: [PATCH 02/20] sign packages --- .gitignore | 1 + .secret-files.tar.enc | Bin 5136 -> 12816 bytes .travis.yml | 7 +++++-- Makefile | 9 +++++++++ README.md | 15 +++++++++++++++ 5 files changed, 30 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index aa59511f..118e4d74 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ README.html /.metadata.make bitly_token github_deploy_key +gpg.signing.key .secret-files.tar diff --git a/.secret-files.tar.enc b/.secret-files.tar.enc index 1e9d5b5a5373851b055c18c9955f7c2211a83f8b..e48ab15621a559540c9523d8a44756eb674f698b 100644 GIT binary patch literal 12816 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 literal 5136 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 diff --git a/.travis.yml b/.travis.yml index e85bf513..84605507 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,8 @@ addons: - libgnome-keyring-dev - fakeroot - zip + - debsigs + - gpg go: - 1.12.x services: @@ -28,18 +30,19 @@ install: - rvm 2.0.0 do gem install --no-document fpm before_script: # 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_e3d3b4b2abab_key -iv $encrypted_e3d3b4b2abab_iv -in .secret-files.tar.enc -out .secret-files.tar -d + - 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 - source .metadata.sh - make vendor script: + - gpg --import gpg.signing.key # Test Go and Docker. - make test - make docker # Test built docker image. - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - - rvm 2.0.0 do make release + - rvm 2.0.0 do SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF make release after_success: # Display Release Folder - ls -l release/ diff --git a/Makefile b/Makefile index cfcba88b..bbb1c1c3 100644 --- a/Makefile +++ b/Makefile @@ -57,6 +57,7 @@ release: clean macos windows linux_packages # Generating File Hashes openssl dgst -r -sha256 $@/* | sed 's#release/##' | tee $@/checksums.sha256.txt + # Delete all build assets. clean: # Cleaning up. @@ -131,41 +132,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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(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)" == "" ] || 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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(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)" == "" ] || 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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(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)" == "" ] || 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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(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)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb # Build an environment that can be packaged for linux. package_build_linux: readme man linux diff --git a/README.md b/README.md index bc92c1ba..deae98bc 100644 --- a/README.md +++ b/README.md @@ -109,6 +109,21 @@ You can drill down into specific sites, switches, and ports. Compare ports in di sites side-by-side. So easy! This screenshot barely does it justice. ![USW Dashboard Image](https://grafana.com/api/dashboards/10417/images/6664/image) +## Integrations + +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 From bbec76a28aeb3263209b08bd715d295f7bc4e311 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 4 Dec 2019 23:22:29 -0800 Subject: [PATCH 03/20] try without this package --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84605507..0b0ad185 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ addons: - fakeroot - zip - debsigs - - gpg go: - 1.12.x services: From ecc6778cb10a4ea084db10f7bf14c17733a5b4d8 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 4 Dec 2019 23:27:26 -0800 Subject: [PATCH 04/20] fix env var --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0b0ad185..1ff7f99e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,7 @@ script: # Test built docker image. - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - - rvm 2.0.0 do SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF make release + - SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF rvm 2.0.0 do make release after_success: # Display Release Folder - ls -l release/ From 37a01b325be155608b71a8d44fb48001ac06326a Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 4 Dec 2019 23:41:15 -0800 Subject: [PATCH 05/20] try this --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1ff7f99e..ee1484bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,10 +31,12 @@ before_script: # 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 --import gpg.signing.key + - rm -f gpg.signing.key .secret-files.tar + - echo "%no-protection" > ~/.rpmmacros - source .metadata.sh - make vendor script: - - gpg --import gpg.signing.key # Test Go and Docker. - make test - make docker From e247690f56014ddb7ea4eb5c989439128914934e Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Wed, 4 Dec 2019 23:52:33 -0800 Subject: [PATCH 06/20] still testing --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ee1484bd..72b43b22 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,6 +34,8 @@ before_script: - gpg --import gpg.signing.key - rm -f gpg.signing.key .secret-files.tar - echo "%no-protection" > ~/.rpmmacros + - echo "%no-ask-passphrase" >> ~/.rpmmacros + - echo "" >> ~/.rpmmacros - source .metadata.sh - make vendor script: From b0252c6abc0273c25b430e3d33f1a1d7734c61c4 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:11:07 -0800 Subject: [PATCH 07/20] more testing --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 72b43b22..8decb114 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,7 @@ addons: - fakeroot - zip - debsigs + - gnupg go: - 1.12.x services: @@ -33,9 +34,9 @@ before_script: - tar -xf .secret-files.tar - gpg --import gpg.signing.key - rm -f gpg.signing.key .secret-files.tar - - echo "%no-protection" > ~/.rpmmacros - - echo "%no-ask-passphrase" >> ~/.rpmmacros - - echo "" >> ~/.rpmmacros + - mkdir -p ~/.gnupg + - echo "%no-protection" > ~/.gnupg/gpg.conf + - echo "%no-ask-passphrase" >> ~/.gnupg/gpg.conf - source .metadata.sh - make vendor script: From 4cc6949d8159a3554c21b20e1312473f1fe34737 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:16:50 -0800 Subject: [PATCH 08/20] more testing --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8decb114..23f67a99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,7 @@ addons: - zip - debsigs - gnupg + - expect go: - 1.12.x services: @@ -33,6 +34,8 @@ before_script: - 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 --import gpg.signing.key + - gpg --import gpg.public.key + - expect -c "spawn gpg --edit-key 616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF trust quit; send \"5\ry\r\"; expect eof" - rm -f gpg.signing.key .secret-files.tar - mkdir -p ~/.gnupg - echo "%no-protection" > ~/.gnupg/gpg.conf From 690d78b30fcdcbc664ee67dd3e3ff936b642d50c Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:19:17 -0800 Subject: [PATCH 09/20] add public key --- gpg.public.key | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 gpg.public.key diff --git a/gpg.public.key b/gpg.public.key new file mode 100644 index 00000000..488a17a6 --- /dev/null +++ b/gpg.public.key @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +Lb2/9Fdos1Y= +=urYT +-----END PGP PUBLIC KEY BLOCK----- From ac131348c6ade13def52ddc72a1a8c066c9326ed Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:38:20 -0800 Subject: [PATCH 10/20] anothertest --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 23f67a99..0ada74da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,9 +32,9 @@ install: before_script: # 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 + - gpg --import gpg.public.key - tar -xf .secret-files.tar - gpg --import gpg.signing.key - - gpg --import gpg.public.key - expect -c "spawn gpg --edit-key 616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF trust quit; send \"5\ry\r\"; expect eof" - rm -f gpg.signing.key .secret-files.tar - mkdir -p ~/.gnupg From 8a5c1142d63f86cc506d7064fbcb65ad36a3c27c Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:42:57 -0800 Subject: [PATCH 11/20] something else --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index bbb1c1c3..aa5f4762 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ 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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm + [ "$(SIGNING_KEY)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm @@ -144,7 +144,7 @@ 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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm + [ "$(SIGNING_KEY)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm deb386: $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm @@ -156,7 +156,7 @@ 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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm + [ "$(SIGNING_KEY)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm debarm: $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm @@ -168,7 +168,7 @@ 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)" == "" ] || rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm + [ "$(SIGNING_KEY)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm debarmhf: $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm From d945f6e3dc760712489c5e21c816726b26612d3b Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:44:51 -0800 Subject: [PATCH 12/20] something else --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aa5f4762..dfe635f6 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ 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)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; send \"n\r\"; expect eof" deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm From 4ab5c838f925792d34e3efa4c41d2ca77a87891b Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:52:49 -0800 Subject: [PATCH 13/20] try again --- .travis.yml | 10 +++------- Makefile | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0ada74da..0200f0c5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,19 +35,15 @@ before_script: - gpg --import gpg.public.key - tar -xf .secret-files.tar - gpg --import gpg.signing.key - - expect -c "spawn gpg --edit-key 616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF trust quit; send \"5\ry\r\"; expect eof" - rm -f gpg.signing.key .secret-files.tar - - mkdir -p ~/.gnupg - - echo "%no-protection" > ~/.gnupg/gpg.conf - - echo "%no-ask-passphrase" >> ~/.gnupg/gpg.conf - source .metadata.sh - make vendor script: # Test Go and Docker. - - make test - - make docker +# - make test +# - make docker # Test built docker image. - - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" +# - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF rvm 2.0.0 do make release after_success: diff --git a/Makefile b/Makefile index dfe635f6..ecec8263 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; send \"n\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"n\r\"; expect eof" deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm From 632a6ac0f06e3c741e0e81390e479d828372fcfd Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 00:59:16 -0800 Subject: [PATCH 14/20] got it --- .travis.yml | 2 +- Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0200f0c5..c8c2c0d3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,9 +30,9 @@ install: - 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 # 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 - - gpg --import gpg.public.key - tar -xf .secret-files.tar - gpg --import gpg.signing.key - rm -f gpg.signing.key .secret-files.tar diff --git a/Makefile b/Makefile index ecec8263..b826b50c 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"n\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm @@ -144,7 +144,7 @@ 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)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" deb386: $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm @@ -156,7 +156,7 @@ 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)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" debarm: $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm @@ -168,7 +168,7 @@ 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)" == "" ] || echo "n" | rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" debarmhf: $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm From e9a8a7960a218e2fd0f753d54ca6ddd14c1c0d36 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 01:03:25 -0800 Subject: [PATCH 15/20] fix ticks --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index b826b50c..79cf7a28 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm @@ -144,7 +144,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" deb386: $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm @@ -156,7 +156,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" debarm: $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm @@ -168,7 +168,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact 'Enter pass phrase: '; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" debarmhf: $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm From 05a7d62cab75c04b3c1d8e2fed628706baa90c9a Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 01:15:42 -0800 Subject: [PATCH 16/20] add back the tests --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index c8c2c0d3..8e2c5c79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,10 @@ before_script: - make vendor script: # Test Go and Docker. -# - make test -# - make docker + - make test + - make docker # Test built docker image. -# - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" + - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF rvm 2.0.0 do make release after_success: From 70b92e4cc3811bf114fe5e32c9e717c26794988f Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 01:18:50 -0800 Subject: [PATCH 17/20] try this --- scripts/package-deploy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/package-deploy.sh b/scripts/package-deploy.sh index e3a82e39..784820a6 100755 --- a/scripts/package-deploy.sh +++ b/scripts/package-deploy.sh @@ -8,13 +8,13 @@ echo "deploying packages from branch: $TRAVIS_BRANCH, tag: $TRAVIS_TAG to repo: source .metadata.sh # deb -cmd="package_cloud push golift/${REPO}/debian/stretch" +cmd="package_cloud push golift/${REPO}/debian/all" $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/5" +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 From 3d3e7cd07564ec3bba71830886cd05f67b6a847c Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 01:31:00 -0800 Subject: [PATCH 18/20] add a secret to the key --- .secret-files.tar.enc | Bin 12816 -> 17936 bytes .travis.yml | 2 +- Makefile | 8 +++---- gpg.public.key | 50 ++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 53 insertions(+), 7 deletions(-) diff --git a/.secret-files.tar.enc b/.secret-files.tar.enc index e48ab15621a559540c9523d8a44756eb674f698b..1248256dc6562b417c54ae7b69e49626b43e61d2 100644 GIT binary patch literal 17936 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­oQ%gKAJAgQH#-_tSo>r#d{^Q;40JAzRI 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 L)9ArHK!nfsL7?+4 literal 12816 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 diff --git a/.travis.yml b/.travis.yml index 8e2c5c79..219a73c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,7 @@ script: # Test built docker image. - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - - SIGNING_KEY=616A79D1ADA2F0FD6F5E2A9166AB29F0EC5718FF rvm 2.0.0 do make release + - rvm 2.0.0 do make release after_success: # Display Release Folder - ls -l release/ diff --git a/Makefile b/Makefile index 79cf7a28..be41b761 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" deb: $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm @@ -144,7 +144,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" deb386: $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm @@ -156,7 +156,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" debarm: $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm @@ -168,7 +168,7 @@ 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) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact \"Enter pass phrase: \"; send \"\r\"; expect eof" + [ "$(SIGNING_KEY)" == "" ] || expect -c "spawn rpmsign --key-id=$(SIGNING_KEY) --addsign $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm; expect -exact \"Enter pass phrase: \"; send \"$(PRIVATE_KEY)\r\"; expect eof" debarmhf: $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm diff --git a/gpg.public.key b/gpg.public.key index 488a17a6..3fce86e6 100644 --- a/gpg.public.key +++ b/gpg.public.key @@ -47,6 +47,52 @@ hXPWldrC41PKF5KMJrjcuaRJyOM7ahTVlia9VLTsIpibsnizaBIVCSVUadV5K4Ta Xt3GDQ+1sXkaBZhPjBHrzilSJSwh/174n+2a/UH1TzZT2ho86XAViU72OsZ68Hxg 3dL3JgQhnQVgTCIxUAmNeNcwZ6zXV+4d9hEZFdtm4xUM1Ctbo6+mSN5QNaOtlIGp aWWwIZ6rgvHh+gTSXU8bGiTip88de6liRlUqv7kshiCnux4OHtEWGy/G4DrRESXK -Lb2/9Fdos1Y= -=urYT +Lb2/9Fdos1aZAg0EXejMmwEQAMo7PzsfT+cGCiJj8JcLY8ooUK/HFQSa65v5eOzY +iO8yYWMBcb93gk/xlR+4gvaydhltpDwjCxsegSUYTBNd5l5jAkpmmY65rW933EBJ +/U0XMac2UKSR2CLkJKI1A2mEdFRgVUlYP5f4aMx+/ZoSm3QVdLHZr3lhLZGqrh9I +R+NPrE6BVdAlSW6wBnhvbaiv2AshjMVzRUK1JC2GmB2UwgCK03u3ar7ru/dMXK3R +Tcs7WM2dYZIUEzzeCoIVPlkhOAfyOZWr2afSh2/9HY5NPlAQcGKQ/5ZaNsoeqsWK +wU5BjNryqugafzpJQCoZTQRC8w2TrZg+cwP4BYS4NpnHnewlpKDO4QYbSVlhitJ3 +PQOT4cges90ixWfqz8EQdEW5lMuDSH3RpIkHhMIr8cq7HqEpw8pjJJlxEM7E8mNC +pQ7fuI9TZqRsOQ6K5StbQdy5Xn9LDqfmTysMq5veXXCSDZZ+yCvw8eXTLka18DyQ +UGmYBCcFfACat9PPoIt/ZbNgd/PFW+o4LLxWjvIH0ukUurbtnx55jbCxF1CZSpEY +srtC9kR6lAVBbclR+x5Jbx2qkw845/TM3s/VQT9+nfADsEO9N274ikwpXZJm/CS+ +G0KaiIjZ1ahC+aBopvFYvU2AupzvElae3G9PAq/gItu7kOocCfo0w6Y7SUe7DTxA +1iXfABEBAAG0GEdvIExpZnQgPGNvZGVAZ29saWZ0LmlvPokCTgQTAQgAOBYhBLk9 +1m75jlTi6uAlugFmrTSrxaV8BQJd6MybAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4B +AheAAAoJEAFmrTSrxaV838IP/1FvdbNArloUGYhhXF87GwF7Iwp/XNNFOfAzVjtG +qxPSbg2eVxOMCIT3cfr6mJtblP26OwvfAIYZ/r2xejfiW/XXYMnmEOBHVNpg7kBB +alQoaqrlc1C35Hw7nReujfgJOqvGt8KPlgP7OtloO+voXr0klLNS07UwLHmPVSOf +lgXshqaZKeidu58cqm/iMZ4pIK260+k4+t1H0ld1UbtSjdciIOfXPZG/ky0LS7CI +8JsBaG7hdsGy7znxMFyKfmOBYliOJpvshfsw1xlSArpoJH/WpQb+uFeqMLPdWbtc +n6Fvlp8ABJEAmry+qxyYaDPQrgK310jU4bQGEazyYFRxEFWosoC1zTrVKQzyh6K9 +70mkJxVLKKPpf5hUERKgVbEQ7cAI1D+ZYYEg45NPbsNpuhvkg64EtIsll1UHm1P0 +/L3UkR3TxeL87Xb7OkFyrpdRL9xQ6J98NWZ8HIDcXxiamBJy+B0vEdzf191rPhi1 +HsVuBIwkO7EFd1P4ZpIVdtjNBXSNTGR56wmv39kk8xWb5DeYP3WZNnrIn+YluuwG +FNPLH6DJ3s5G6yoBhKJNONF0bpnM+K3wEahfuzxMir90jFvnGeReBVpow5EeOukL +YuX13iiWwqzPJpdxJhn4eiE8jck1T8yvptGccMA6Tvzj2tqc6hZf54cb4nIRPiSj +rCU5uQINBF3ozJsBEADVAnWifMaVeHUceAxrfDLtbEruMnhqc+dP423a3gu9MVSr +josvaGDOa8rMnm0UOsxQELLJuTWz/6EmjD5tEFgjBAOQq64FerUstKTaCF4wM1pA +nGvnkQZ4xUt2te4dCDqYWbZvomCQTO7ayucij2pokyyPeLk7dl8+AZVR1rfev/ro +jNvc/2Q3rE3Ba8u2351w9hXFtfxfx3fen0pHDzJhifR0SaPmuleubTSiJIS5iP1j +9o8ofBuGuSPXJF0r1JrBAFpNvy6ZpxykAri26G7PHks4rOU7oPRnJ1sICRFsqyGU +7tthUCRKRIiV0MgxBjSYbg/gDSz+oGNO0WV56DWugmRYOpyGG6roP4zXHhkzdbiT +WTJA9fpv1zru/qf7ZY9a2o4hqG9EtvvNeSicfpM6/c6inOiPXqW5Jq5fBdCF9wn/ +wH6um4R2x0mYKyv1TJQc0Lr8O35KvzZOSqDvhWQKS/TTNdvzkRhO5fHsAl6IKs2M +QbgPxRBQYLu/JjAA8UCC+E0z/MDzKK1+WPjlukZyCtegnbQ2YtAuAkoli5U4OYnO +fbKVxdCWE18/UPAN/NQh4hfTgmD+pucOx4auan+NerSipDwu6Mf6/wplsEyaKeWY +sgomY7ZNaIxZ8qI0UIPmRBaWq3FnGXG6KxFOqn0KtXEZ5rLFDW7Nf02ExCMD4QAR +AQABiQI2BBgBCAAgFiEEuT3WbvmOVOLq4CW6AWatNKvFpXwFAl3ozJsCGwwACgkQ +AWatNKvFpXxOzA//fikFCbK/IznPGXuVGkd2m1T5mn0eySN4UZOAlmKFGlG78LN0 +VNKrYxeloFZEuWRUSI6Hy3FflucDcMAV9PIonboJztY4g9e4aKhfutXm2pYchDcU +7RB4anA42WJUZj1wZYxF97kp8jFxQljlyQjhz2V4CceNy4zR//RbjFaDimh8rjMP +qO+d5QHwgDUo8ci7M7QQoIVqh50qRblLfBpVzxJp5hOT1HQOXa01sr1Dukg8G3Rs +ft3CdO3ucKu0mBLt2kqNGjrGlJ83WPY/QTtt/mhP3jAozxlMxJaom3I2Bh8OUCzl +FQySsCKN1dtOQAMfBa4XmOS7Q/S0+QZxs66zRS0ZH2fFvSBM/M5ZDOS/I9zNjsk1 +NPkk/Ux3dVZhg83bEj+TNrF5wxePcB9uXLTzYfu5odTclIUN5v30Ac4LmmgRmq9X +XaAdiZYN+UwuxoJIqWZ9xKHM2bdHRWebbzfNoErargqq+Y2wDrn6gz8qg3iOqWW0 +fnMY8ecezS3J7zVE45RH/ogm9u1dAGhOHAUtptdfk3C7UUTV7R+I+64cJ3AA3/zq +f0aex2fjowxm/EFXF0OSvbi3EpO4rInK0iJ5DeDK9WdBm99Lh8jS93sixXjhhDxD +wD2mbCltbnpHUYpdfgxdue48mflt9uxM7EaUyChP70yJ7hiFbjfBz8yRYxY= +=qJFS -----END PGP PUBLIC KEY BLOCK----- From 00e411e45a11350d8c80afc8562eea1849243a9d Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 01:39:48 -0800 Subject: [PATCH 19/20] fix deb signing with key --- .travis.yml | 6 +++--- Makefile | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 219a73c0..f1c55ba6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,10 @@ before_script: - make vendor script: # Test Go and Docker. - - make test - - make docker +# - make test +# - make docker # Test built docker image. - - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" +# - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - rvm 2.0.0 do make release after_success: diff --git a/Makefile b/Makefile index be41b761..2de78045 100644 --- a/Makefile +++ b/Makefile @@ -138,7 +138,7 @@ 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)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb + [ "$(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" rpm386: $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm: package_build_linux_386 check_fpm @@ -150,7 +150,7 @@ 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)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb + [ "$(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" rpmarm: $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm: package_build_linux_arm64 check_fpm @@ -162,7 +162,7 @@ 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)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb + [ "$(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" rpmarmhf: $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm: package_build_linux_armhf check_fpm @@ -174,7 +174,7 @@ 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)" == "" ] || debsigs --default-key="$(SIGNING_KEY)" --sign=origin $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb + [ "$(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" # Build an environment that can be packaged for linux. package_build_linux: readme man linux From fe066e9b841fcc9ba5901952d40ff4e7c5de2e96 Mon Sep 17 00:00:00 2001 From: davidnewhall2 Date: Thu, 5 Dec 2019 01:52:10 -0800 Subject: [PATCH 20/20] add tests back --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f1c55ba6..219a73c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,10 +40,10 @@ before_script: - make vendor script: # Test Go and Docker. -# - make test -# - make docker + - make test + - make docker # Test built docker image. -# - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" + - docker run $BINARY -v 2>&1 | grep -Eq "^$BINARY v$VERSION" # Build everything - rvm 2.0.0 do make release after_success: