Merge pull request #1302 from cloudflare/nicky/release-with-vcs

Author: nickysemenza

.goreleaser.yml

@@ -18,8 +18,6 @@ builds:
     main: ./cmd/cfssl
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-linux
     binary: cfssl
     goos:
@@ -32,8 +30,6 @@ builds:
     main: ./cmd/cfssl
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-windows
     binary: cfssl
     env:
@@ -46,8 +42,6 @@ builds:
     main: ./cmd/cfssl
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-bundle-darwin
     binary: cfssl-bundle
     env:
@@ -61,8 +55,6 @@ builds:
     main: ./cmd/cfssl-bundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-bundle-linux
     binary: cfssl-bundle
     goos:
@@ -75,8 +67,6 @@ builds:
     main: ./cmd/cfssl-bundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-bundle-windows
     binary: cfssl-bundle
     env:
@@ -89,8 +79,6 @@ builds:
     main: ./cmd/cfssl-bundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-certinfo-darwin
     binary: cfssl-certinfo
     env:
@@ -104,8 +92,6 @@ builds:
     main: ./cmd/cfssl-certinfo
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-certinfo-linux
     binary: cfssl-certinfo
     goos:
@@ -118,8 +104,6 @@ builds:
     main: ./cmd/cfssl-certinfo
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-certinfo-windows
     binary: cfssl-certinfo
     env:
@@ -132,8 +116,6 @@ builds:
     main: ./cmd/cfssl-certinfo
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-newkey-darwin
     binary: cfssl-newkey
     env:
@@ -147,8 +129,6 @@ builds:
     main: ./cmd/cfssl-newkey
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-newkey-linux
     binary: cfssl-newkey
     goos:
@@ -161,8 +141,6 @@ builds:
     main: ./cmd/cfssl-newkey
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-newkey-windows
     binary: cfssl-newkey
     env:
@@ -175,8 +153,6 @@ builds:
     main: ./cmd/cfssl-newkey
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-scan-darwin
     binary: cfssl-scan
     env:
@@ -190,8 +166,6 @@ builds:
     main: ./cmd/cfssl-scan
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-scan-linux
     binary: cfssl-scan
     goos:
@@ -204,8 +178,6 @@ builds:
     main: ./cmd/cfssl-scan
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssl-scan-windows
     binary: cfssl-scan
     env:
@@ -218,8 +190,6 @@ builds:
     main: ./cmd/cfssl-scan
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssljson-darwin
     binary: cfssljson
     env:
@@ -233,8 +203,6 @@ builds:
     main: ./cmd/cfssljson
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssljson-linux
     binary: cfssljson
     goos:
@@ -247,8 +215,6 @@ builds:
     main: ./cmd/cfssljson
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: cfssljson-windows
     binary: cfssljson
     env:
@@ -261,8 +227,6 @@ builds:
     main: ./cmd/cfssljson
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: mkbundle-darwin
     binary: mkbundle
     env:
@@ -276,8 +240,6 @@ builds:
     main: ./cmd/mkbundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: mkbundle-linux
     binary: mkbundle
     goos:
@@ -290,8 +252,6 @@ builds:
     main: ./cmd/mkbundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: mkbundle-windows
     binary: mkbundle
     env:
@@ -304,8 +264,6 @@ builds:
     main: ./cmd/mkbundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: multirootca-darwin
     binary: multirootca
     env:
@@ -319,8 +277,6 @@ builds:
     main: ./cmd/multirootca
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: multirootca-linux
     binary: multirootca
     goos:
@@ -333,8 +289,6 @@ builds:
     main: ./cmd/multirootca
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
   - id: multirootca-windows
     binary: multirootca
     env:
@@ -347,8 +301,6 @@ builds:
     main: ./cmd/multirootca
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-    flags:
-      - -buildvcs=false
 archives:
   - format: binary
     allow_different_binary_count: true # https://github.com/goreleaser/goreleaser/pull/1841

Makefile

@@ -60,7 +60,7 @@ snapshot:
 	--rm \
     -v $(PWD):/cross \
     -w /cross \
-    ghcr.io/gythialy/golang-cross:latest --clean --snapshot --skip-publish
+    ghcr.io/goreleaser/goreleaser-cross:latest --clean --snapshot --skip-publish
 
 .PHONY: github-release
 github-release:
@@ -71,7 +71,7 @@ github-release:
 	-e GITHUB_TOKEN=$(GITHUB_TOKEN) \
     -v $(PWD):/cross \
     -w /cross \
-    ghcr.io/gythialy/golang-cross:latest --clean
+    ghcr.io/goreleaser/goreleaser-cross:latest --clean
 
 .PHONY: docker-build
 docker-build: