fix: release build issues

- remove incorrect 'go mod tidy' - remove unnecessary 'go mod download'
minio · Jul 17, 2024 · 915556e · 915556e
1 parent fc934fd
commit 915556e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -14,7 +14,6 @@ release:
 before:
   hooks:
     - make clean
-    - go mod tidy -compat=1.21.8
     - go mod download
 
 builds:

diff --git a/pkg/build-constants.go b/pkg/build-constants.go
@@ -27,6 +27,4 @@ var (
 	CommitID = "(dev)"
 	// ShortCommitID - first 12 characters from CommitID.
 	ShortCommitID = "(dev)"
-	// MPSecret - MP Secret
-	MPSecret = "(dev)"
 )
diff --git a/sidecar/.goreleaser.yml b/sidecar/.goreleaser.yml
@@ -14,8 +14,6 @@ release:
 before:
   hooks:
     - make clean
-    - go mod tidy -compat=1.21.8
-    - go mod download
 
 builds:
   - id: minio-operator-sidecar
@@ -31,7 +29,7 @@ builds:
     binary: minio-operator-sidecar
     main: ./cmd/sidecar/
     ldflags:
-      - -s -w -X github.com/minio/operator/pkg.ReleaseTag={{.Tag}} -X github.com/minio/operator/pkg.CommitID={{.FullCommit}} -X github.com/minio/operator/sidecar/pkg.Version={{.Version}} -X github.com/minio/operator/sidecar/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/operator/pkg.ReleaseTime={{.Date}}
+      - -s -w -X github.com/minio/operator/sidecar/pkg.ReleaseTag={{.Tag}} -X github.com/minio/operator/sidecar/pkg.CommitID={{.FullCommit}} -X github.com/minio/operator/sidecar/pkg.Version={{.Version}} -X github.com/minio/operator/sidecar/pkg.ShortCommitID={{.ShortCommit}} -X github.com/minio/operator/sidecar/pkg.ReleaseTime={{.Date}}
     flags:
       - -trimpath
 

diff --git a/sidecar/Makefile b/sidecar/Makefile
@@ -7,7 +7,7 @@ VERSIONV ?= $(shell git describe --tags | sed 's,v,,g')
 endif
 TAG ?= "minio/operator-sidecar:$(VERSION)"
 SHA ?= $(shell git rev-parse --short HEAD)
-LDFLAGS ?= "-s -w -X github.com/minio/operator/pkg.ReleaseTag=$(VERSIONV) -X github.com/minio/operator/sidecar/pkg.Version=$(VERSION) -X github.com/minio/operator/sidecar/pkg.ShortCommitID=$(SHA)"
+LDFLAGS ?= "-s -w -X github.com/minio/operator/sidecar/pkg.ReleaseTag=$(VERSIONV) -X github.com/minio/operator/sidecar/pkg.Version=$(VERSION) -X github.com/minio/operator/sidecar/pkg.ShortCommitID=$(SHA)"
 GOPATH := $(shell go env GOPATH)
 GOARCH := $(shell go env GOARCH)
 GOOS := $(shell go env GOOS)

diff --git a/sidecar/pkg/build-constants.go b/sidecar/pkg/build-constants.go
@@ -27,6 +27,4 @@ var (
 	CommitID = "(dev)"
 	// ShortCommitID - first 12 characters from CommitID.
 	ShortCommitID = "(dev)"
-	// MPSecret - MP Secret
-	MPSecret = "(dev)"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,6 @@ release: @@
     before:
       hooks:
         - make clean
-        - go mod tidy -compat=1.21.8
         - go mod download
     builds:
@@ Expand Down @@