update release make target to use go 1.18

cloudflare · Aug 26, 2022 · bba3a20 · bba3a20
1 parent cacf170
commit bba3a20
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,4 @@ bin
 *.deb
 *.rpm
 test
-
+.DS_Store
diff --git 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
@@ -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:
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,4 @@ bin @@
     *.deb
     *.rpm
     test
+    .DS_Store