Cleanup (#1304)

RELEASE_NOTES=n/a

Signed-off-by: Dominik Schulz <[email protected]>

CONTRIBUTING.md

@@ -35,6 +35,7 @@ will try to clarify it.
 
 * Add a [DCO](https://developercertificate.org/) / `Signed-off-by` line in any commit message.
 
+* Add a RELEASE_NOTES entry in every commit. Set it to n/a for minor changes that are not noteworthy for the changelog.
 
 ## Building & Testing
 
@@ -52,20 +53,11 @@ repository.
 
 ### Preparation
 
-In order to release gopass we currently rely on a patched version of goreleaser.
-While most of our customizations have been submited and merged upstream some had
-to be changed to be accepted and others were rejected. We'd like to switch back
-to vanilla goreleaser in the future, but this requires some tweaks to the build
-and release process.
+gopass release should work with the latest upstream version of goreleaser.
 
 ```bash
-# Install our modified version of goreleaser
 go get -u github.com/goreleaser/goreleaser
 cd $GOPATH/src/github.com/goreleaser/goreleaser
-git remote add gopass [email protected]:gopasspw/goreleaser.git
-git fetch gopass
-git checkout gopass
-git pull gopass gopass
 go install
 ```
 

Makefile

@@ -235,6 +235,7 @@ codequality-nomod:
 fmt:
 	@gofmt -s -l -w $(GOFILES_NOVENDOR)
 	@clang-format -i $(PROTOFILES)
+	@go mod tidy
 
 fuzz-gpg:
 	mkdir -p workdir/gpg-cli/corpus
@@ -254,41 +255,17 @@ check-release-env:
 ifndef GITHUB_TOKEN
 	$(error GITHUB_TOKEN is undefined)
 endif
-ifndef BINTRAY_USER
-	$(error BINTRAY_USER is undefined)
-endif
-ifndef BINTRAY_GPG_PASSPHRASE
-	$(error BINTRAY_GPG_PASSPHRASE is undefined)
-endif
-ifndef BINTRAY_API_KEY
-	$(error BINTRAY_API_KEY is undefined)
-endif
 
-release: goreleaser bintray
+release: goreleaser
 
 goreleaser: check-release-env travis clean
 	@echo ">> RELEASE, goreleaser"
 	@goreleaser
 
-bintray: check-release-env
-	@echo ">> RELEASE, deb packages"
-	@$(eval AMD64DEB:=$(shell ls ./dist/gopass-*-amd64.deb | xargs -n1 basename))
-	@curl -f -T ./dist/$(AMD64DEB) -H "X-GPG-PASSPHRASE:$(BINTRAY_GPG_PASSPHRASE)" -u$(BINTRAY_USER):$(BINTRAY_API_KEY) "https://api.bintray.com/content/gopasspw/gopass/gopass/v$(GOPASS_VERSION)/pool/main/g/gopass/$(AMD64DEB);deb_distribution=trusty,xenial,bionic,wheezy,jessie,buster,sid;deb_component=main;deb_architecture=amd64;publish=1"
-	@echo ""
-
-	@$(eval I386DEB:=$(shell ls ./dist/gopass-*-386.deb | xargs -n1 basename))
-	@curl -f -T ./dist/$(I386DEB) -H "X-GPG-PASSPHRASE:$(BINTRAY_GPG_PASSPHRASE)" -u$(BINTRAY_USER):$(BINTRAY_API_KEY) "https://api.bintray.com/content/gopasspw/gopass/gopass/v$(GOPASS_VERSION)/pool/main/g/gopass/$(I386DEB);deb_distribution=trusty,xenial,bionic,wheezy,jessie,buster,sid;deb_component=main;deb_architecture=i386;publish=1"
-	@echo ""
-
-	@echo "   CALCULATE METADATA, deb repository"
-	@curl -f -X POST -H "X-GPG-PASSPHRASE:$(BINTRAY_GPG_PASSPHRASE)" -u$(BINTRAY_USER):$(BINTRAY_API_KEY) https://api.bintray.com/calc_metadata/gopasspw/gopass
-	@echo ""
-	@echo ">> DONE"
-
 deps:
 	go build -v ./...
 
 upgrade:
 	go get -u
 
-.PHONY: clean build completion install sysinfo crosscompile test codequality release goreleaser debsign bintray
+.PHONY: clean build completion install sysinfo crosscompile test codequality release goreleaser debsign

README.md

@@ -86,6 +86,8 @@ This project uses [GitHub Flow](https://guides.github.com/introduction/flow/). I
 
 We aim for compatibility with the [latest stable Go Release](https://golang.org/dl/) only.
 
+While this project is maintained by volunteers in their free time we aim to triage issues weekly and release a new version at least every quarter.
+
 ## Credit & License
 
 gopass was created by the nice folks from [JustWatch](https://www.justwatch.com/gopass) and licensed under the terms of the MIT license.

go.mod

@@ -34,7 +34,6 @@ require (
 	github.com/schollz/closestmatch v0.0.0-20190308193919-1fbe626be92e
 	github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086
 	github.com/stretchr/testify v1.5.1
-	github.com/urfave/cli v1.22.4
 	github.com/urfave/cli/v2 v2.2.0
 	golang.org/x/crypto v0.0.0-20200423211502-4bdfaf469ed5
 	golang.org/x/net v0.0.0-20200421231249-e086a090c8fd

go.sum

@@ -106,8 +106,6 @@ github.com/skip2/go-qrcode v0.0.0-20191027152451-9434209cb086/go.mod h1:PLPIyL7i
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/urfave/cli v1.22.4 h1:u7tSpNPPswAFymm8IehJhy4uJMlUuU/GmqSkvJ1InXA=
-github.com/urfave/cli v1.22.4/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
 github.com/urfave/cli/v2 v2.2.0 h1:JTTnM6wKzdA0Jqodd966MVj4vWbbquZykeX1sKbe2C4=
 github.com/urfave/cli/v2 v2.2.0/go.mod h1:SE9GqnLQmjVa0iPEY0f1w3ygNIYcIJ0OKPMoW2caLfQ=
 github.com/xrash/smetrics v0.0.0-20170218160415-a3153f7040e9 h1:w8V9v0qVympSF6GjdjIyeqR7+EVhAF9CBQmkmW7Zw0w=