Merge 0bab7ee into bc85a07

.goreleaser.yml

@@ -59,7 +59,9 @@ builds:
   goarch:
     - amd64  
 archives:
-  - format: tar.gz
+  - 
+    allow_different_binary_count: true
+    format: tar.gz
     format_overrides:
       - goos: windows
         format: zip
@@ -95,7 +97,7 @@ changelog:
     - Merge branch    
 brews:
   -
-    github:
+    tap:
       owner: mailchain
       name: homebrew-tap
     folder: Formula
@@ -112,7 +114,7 @@ scoop:
   license: MIT
 dockers:
   -     
-    binaries: # Name templates of the built binaries that should be used.
+    binaries:
     - indexer
     goos: linux # GOOS of the built binary that should be used. 
     goarch: amd64 # GOARCH of the built binary that should be used.
@@ -131,7 +133,7 @@ dockers:
     - "--label=repository=https://github.com/mailchain/mailchain"
     - "--label=homepage=https://mailchain.xyz"
   -     
-    binaries: # Name templates of the built binaries that should be used.
+    binaries:
     - receiver
     goos: linux # GOOS of the built binary that should be used. 
     goarch: amd64 # GOARCH of the built binary that should be used.

.travis.yml

@@ -5,7 +5,7 @@ services:
 go_import_path: github.com/mailchain/mailchain
 matrix:
   include:
-    - go: 1.13.x
+    - go: 1.16.x
       env: 
       - DEPLOY=true
       - GO111MODULE=on
@@ -22,7 +22,7 @@ script:
   - git diff --exit-code
 deploy:
   - provider: script
-    script: docker run -e DOCKER_USERNAME=$DOCKER_USERNAME -e DOCKER_PASSWORD=$DOCKER_PASSWORD -e GITHUB_TOKEN=$GITHUB_TOKEN --rm --privileged -v $TRAVIS_BUILD_DIR:/go/src/github.com/mailchain/mailchain -v /var/run/docker.sock:/var/run/docker.sock -w /go/src/github.com/mailchain/mailchain mailchain/goreleaser-xcgo --rm-dist
+    script: docker run -e DOCKER_USERNAME=$DOCKER_USERNAME -e DOCKER_PASSWORD=$DOCKER_PASSWORD -e GITHUB_TOKEN=$GITHUB_TOKEN --rm --privileged -v $TRAVIS_BUILD_DIR:/go/src/github.com/mailchain/mailchain -v /var/run/docker.sock:/var/run/docker.sock -w /go/src/github.com/mailchain/mailchain neilotoole/xcgo goreleaser --rm-dist
     skip_cleanup: true
     on:
       tags: true

Makefile

@@ -71,7 +71,7 @@ openapi:
 	rm -rf vendor
 
 snapshot:
-	docker run --rm --privileged -v $(CURDIR):/go/src/github.com/mailchain/mailchain -v /var/run/docker.sock:/var/run/docker.sock -w /go/src/github.com/mailchain/mailchain mailchain/goreleaser-xcgo --snapshot --rm-dist
+	docker run --rm --privileged -v $(CURDIR):/go/src/github.com/mailchain/mailchain -v /var/run/docker.sock:/var/run/docker.sock -w /go/src/github.com/mailchain/mailchain neilotoole/xcgo goreleaser --snapshot --rm-dist
 
 lint: 
 	golangci-lint run --fix

crypto/cipher/cipher.go

@@ -13,7 +13,9 @@
 // limitations under the License.
 
 // Package cipher collects common cryptographic constants and interfaces.
-package cipher //go:generate mockgen -source=cipher.go -package=ciphertest -destination=./ciphertest/cipher_mock.go
+package cipher
+
+//go:generate mockgen -source=cipher.go -package=ciphertest -destination=./ciphertest/cipher_mock.go
 
 const (
 	// NoOperation identified for Encrypt and Decrypter in noop package.

go.mod

@@ -1,6 +1,6 @@
 module github.com/mailchain/mailchain
 
-go 1.13
+go 1.16
 
 require (
 	github.com/DATA-DOG/go-sqlmock v1.4.1
@@ -54,7 +54,6 @@ require (
 	github.com/wealdtech/go-ens/v3 v3.4.3
 	golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a
 	golang.org/x/net v0.0.0-20200904194848-62affa334b73 // indirect
-	golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208 // indirect
 	golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f // indirect
 	golang.org/x/text v0.3.3 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect