From f6cb3e8a12c79fd074c0ef514aba1d25e0f73436 Mon Sep 17 00:00:00 2001 From: Nicky Semenza Date: Thu, 11 May 2023 12:41:54 -0700 Subject: [PATCH] build pacakges with latest go disabling buildvcs for now, seems to be related to https://github.com/golang/go/issues/51253 --- .github/workflows/go.yml | 2 +- .goreleaser.yml | 48 ++++++++++++++++++++++++++++++++++++++++ Makefile | 4 ++-- 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 4006e25e0..8f85e0d9d 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - go: ["1.18", "1.19"] + go: [stable, oldstable] services: # Label used to access the service container postgres: diff --git a/.goreleaser.yml b/.goreleaser.yml index 682bc6667..d0f7aa0b1 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -18,6 +18,8 @@ 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: @@ -30,6 +32,8 @@ 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: @@ -42,6 +46,8 @@ 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: @@ -55,6 +61,8 @@ 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: @@ -67,6 +75,8 @@ 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: @@ -79,6 +89,8 @@ 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: @@ -92,6 +104,8 @@ 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: @@ -104,6 +118,8 @@ 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: @@ -116,6 +132,8 @@ 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: @@ -129,6 +147,8 @@ 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: @@ -141,6 +161,8 @@ 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: @@ -153,6 +175,8 @@ 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: @@ -166,6 +190,8 @@ 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: @@ -178,6 +204,8 @@ 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: @@ -190,6 +218,8 @@ 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: @@ -203,6 +233,8 @@ 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: @@ -215,6 +247,8 @@ 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: @@ -227,6 +261,8 @@ 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: @@ -240,6 +276,8 @@ 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: @@ -252,6 +290,8 @@ 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: @@ -264,6 +304,8 @@ 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: @@ -277,6 +319,8 @@ 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: @@ -289,6 +333,8 @@ 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: @@ -301,6 +347,8 @@ 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 diff --git a/Makefile b/Makefile index 6c72dc03b..fb1a9df2a 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,7 @@ snapshot: --rm \ -v $(PWD):/cross \ -w /cross \ - ghcr.io/gythialy/golang-cross:v1.18 --rm-dist --snapshot --skip-publish + ghcr.io/gythialy/golang-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:v1.18 --rm-dist + ghcr.io/gythialy/golang-cross:latest --clean .PHONY: docker-build docker-build: