Setting buildid is no longer necessary for reproducible builds

golang/go@aa680c0
carvel-dev · May 11, 2022 · d383797 · d383797
1 parent ded5312
commit d383797
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -20,7 +20,6 @@ builds:
       - -trimpath
 
     ldflags:
-      - -buildid=
       - -X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version={{ .Version }}
 
 archives:

diff --git a/hack/build-binaries.sh b/hack/build-binaries.sh
@@ -14,7 +14,7 @@ go mod tidy
 
 # makes builds reproducible
 export CGO_ENABLED=0
-LDFLAGS="-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=$VERSION -buildid="
+LDFLAGS="-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=$VERSION"
 
 ./hack/build.sh $VERSION # Used to generate website/generated.go used by ytt website
 

diff --git a/hack/build.sh b/hack/build.sh
@@ -7,7 +7,7 @@ VERSION="${1:-$LATEST_GIT_TAG}"
 
 # makes builds reproducible
 export CGO_ENABLED=0
-LDFLAGS="-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=$VERSION -buildid="
+LDFLAGS="-X github.com/vmware-tanzu/carvel-ytt/pkg/version.Version=$VERSION"
 
 rm -f website/generated.go
 

diff --git a/hack/test-windows.ps1 b/hack/test-windows.ps1
@@ -2,7 +2,7 @@
 
 # makes builds reproducible
 $env:CGO_ENABLED = 0
-$repro_flags = "-ldflags=-buildid= -trimpath"
+$repro_flags = "-ldflags=-trimpath"
 
 echo Formatting
 go fmt ./cmd/... ./pkg/...