From bba3a2015ca4ad91f5b2c61c5876f0ecbfcb39bc Mon Sep 17 00:00:00 2001
From: Nicky Semenza <nicky@cloudflare.com>
Date: Fri, 26 Aug 2022 11:51:10 -0700
Subject: [PATCH] update release make target to use go 1.18

---
 .gitignore      | 2 +-
 .goreleaser.yml | 1 +
 Makefile        | 8 +++++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index d6c845e65..6b0acf7a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@ bin
 *.deb
 *.rpm
 test
-
+.DS_Store
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 8c355ac6b..38ad63db4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -295,6 +295,7 @@ builds:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
 archives:
   - format: binary
+    allow_different_binary_count: true # https://github.com/goreleaser/goreleaser/pull/1841
 release:
   github:
     owner: cloudflare
diff --git a/Makefile b/Makefile
index 19d64a9b0..52c49b31a 100644
--- a/Makefile
+++ b/Makefile
@@ -57,7 +57,13 @@ snapshot:
 .PHONY: github-release
 github-release:
 	@:$(call check_defined, GITHUB_TOKEN)
-	docker run -e GITHUB_TOKEN=$(GITHUB_TOKEN) --rm  -v $(PWD):/workdir -w /workdir cbroglie/goreleaser-cgo:1.12.12-musl goreleaser --rm-dist
+
+	docker run --rm --privileged \
+	 -e GITHUB_TOKEN=$(GITHUB_TOKEN) \
+    -v $(PWD):/cross \
+    -v /var/run/docker.sock:/var/run/docker.sock \
+    -w /cross \
+    ghcr.io/gythialy/golang-cross:v1.18 --rm-dist
 
 .PHONY: docker-build
 docker-build: