From 0e1c2d504eb4117bc7ef2ad76134687c7db97f09 Mon Sep 17 00:00:00 2001 From: "Cody A. Ray" Date: Mon, 30 Jul 2018 10:56:11 -0500 Subject: [PATCH] Revert "Fix artifact signing on semaphore using confluent-packaging gpg key" This reverts commit 8f317f74fe1c6203de2accfb26124b42a894e241. --- .goreleaser.yml | 2 -- Gopkg.toml | 4 ++++ Makefile | 7 ------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.goreleaser.yml b/.goreleaser.yml index acf40979c..4fcd336ee 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -87,8 +87,6 @@ archive: sign: artifacts: checksum - # assumes SemaphoreCI gpg has these secret files already - args: ["--batch", "no-use-agent", "--passphrase-file", "/home/runner/confluent-packaging-private.passphrase", "--output", "${signature}", "--detach-sign", "${artifact}"] changelog: sort: asc diff --git a/Gopkg.toml b/Gopkg.toml index 0651f70ff..2fbd721f0 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -58,6 +58,10 @@ source = "github.com/codyaray/sling" branch = "jsonpb" +[[constraint]] + name = "github.com/hashicorp/hcl" + revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168" + [prune] go-tests = true unused-packages = true diff --git a/Makefile b/Makefile index 133f526a2..cbfc9d142 100644 --- a/Makefile +++ b/Makefile @@ -32,18 +32,11 @@ release: get-release-image commit-release tag-release .PHONY: release-ci release-ci: ifeq ($(BRANCH_NAME),master) - make init-gpg make release else true endif -.PHONY: init-gpg -init-gpg: - # assumes SemaphoreCI gpg has these secret files already - gpg --import ~/confluent-packaging-public.key - gpg --passphrase ~/confluent-packaging-private.passphrase --allow-secret-key-import --import ~/confluent-packaging-private.key - .PHONY: lint lint: gometalinter ./... --vendor