Merge pull request #1259 from sonork/master

Add linux/arm64 Build

Author: nickysemenza

.goreleaser.yml

@@ -1,6 +1,6 @@
 env:
   - GO111MODULE=on
-  - CGO_ENABLED=1
+  - CGO_ENABLED=0
   - GOFLAGS=-mod=vendor
   - GOPROXY=off
 builds:
@@ -9,6 +9,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -23,12 +24,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/cfssl
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-windows
     binary: cfssl
     env:
@@ -46,6 +45,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -59,12 +59,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/cfssl-bundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-bundle-windows
     binary: cfssl-bundle
     env:
@@ -82,6 +80,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -95,12 +94,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/cfssl-certinfo
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-certinfo-windows
     binary: cfssl-certinfo
     env:
@@ -118,6 +115,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -131,12 +129,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/cfssl-newkey
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-newkey-windows
     binary: cfssl-newkey
     env:
@@ -154,6 +150,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -167,12 +164,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/cfssl-scan
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssl-scan-windows
     binary: cfssl-scan
     env:
@@ -190,6 +185,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -203,12 +199,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/cfssljson
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: cfssljson-windows
     binary: cfssljson
     env:
@@ -226,6 +220,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -239,12 +234,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/mkbundle
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: mkbundle-windows
     binary: mkbundle
     env:
@@ -262,6 +255,7 @@ builds:
     env:
       - CC=o64-clang
       - CXX=o64-clang++
+      - CGO_ENABLED=1
     goos:
       - darwin
     goarch:
@@ -275,12 +269,10 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm64
     main: ./cmd/multirootca
     ldflags:
       - -s -w -X github.com/cloudflare/cfssl/cli/version.version={{.Version}}
-      - -linkmode external -extldflags "-static"
-    env:
-      - CC=/usr/bin/musl-gcc
   - id: multirootca-windows
     binary: multirootca
     env:

Makefile

@@ -48,16 +48,20 @@ __check_defined = \
 
 .PHONY: snapshot
 snapshot:
-	docker run --rm  -v $(PWD):/workdir -w /workdir cbroglie/goreleaser-cgo:1.12.12-musl goreleaser --rm-dist --snapshot --skip-publish
+	docker run \
+	--rm \
+    -v $(PWD):/cross \
+    -w /cross \
+    ghcr.io/gythialy/golang-cross:v1.18 --rm-dist --snapshot --skip-publish
 
 .PHONY: github-release
 github-release:
 	@:$(call check_defined, GITHUB_TOKEN)
 
-	docker run --rm --privileged \
-	 -e GITHUB_TOKEN=$(GITHUB_TOKEN) \
+	docker run \
+	--rm \
+	-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