feat(goreleaser): Update goreleaser (#104)

simon-cj · web-flow · commit a86c166d3f11 · 2020-08-06T09:50:14.000+08:00
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -4,9 +4,19 @@ builds:
 - id: ormb
   main: ./cmd/ormb/main.go
   binary: ormb
+  ldflags:
+    - -s -w 
+    - -X github.com/kleveross/ormb/pkg/version.VERSION={{ .Version }} 
+    - -X github.com/kleveross/ormb/pkg/version.COMMIT={{ .Commit }}
+    - -X github.com/kleveross/ormb/pkg/version.REPOROOT={{ .GitURL }}
 - id: ormb-storage-initializer
   main: ./cmd/ormb-storage-initializer/main.go
   binary: ormb-storage-initializer
+  ldflags:
+    - -s -w 
+    - -X github.com/kleveross/ormb/pkg/version.VERSION={{ .Version }} 
+    - -X github.com/kleveross/ormb/pkg/version.COMMIT={{ .Commit }}
+    - -X github.com/kleveross/ormb/pkg/version.REPOROOT={{ .GitURL }}
 archives:
 - replacements:
     darwin: Darwin
diff --git a/Makefile b/Makefile
@@ -118,7 +118,7 @@ test: generate
 
 build-local:
 	@for target in $(TARGETS); do                                                      \
-	  CGO_ENABLED=$(CGO_ENABLED) go build -v -o $(OUTPUT_DIR)/$${target}                                          \
+	  CGO_ENABLED=$(CGO_ENABLED) go build -v -o $(OUTPUT_DIR)/$${target}               \
 	    -ldflags "-s -w -X $(ROOT)/pkg/version.VERSION=$(VERSION)                      \
 	      -X $(ROOT)/pkg/version.COMMIT=$(GITSHA)                                      \
 	      -X $(ROOT)/pkg/version.REPOROOT=$(ROOT)"                                     \
@@ -139,6 +139,7 @@ build-linux:
 	    /bin/bash -c 'for target in $(TARGETS); do                                     \
 	      go build -v -o $(OUTPUT_DIR)/$${target}                                      \
 	        -ldflags "-s -w -X $(ROOT)/pkg/version.VERSION=$(VERSION)                  \
+	          -X $(ROOT)/pkg/version.COMMIT=$(GITSHA)                                  \
 	          -X $(ROOT)/pkg/version.REPOROOT=$(ROOT)"                                 \
 	        $(CMD_DIR)/$${target};                                                     \
 	    done'
diff --git a/cmd/ormb-storage-initializer/main.go b/cmd/ormb-storage-initializer/main.go
@@ -15,7 +15,9 @@ limitations under the License.
 */
 package main
 
-import "github.com/kleveross/ormb/cmd/ormb-storage-initializer/cmd"
+import (
+	"github.com/kleveross/ormb/cmd/ormb-storage-initializer/cmd"
+)
 
 func main() {
 	cmd.Execute()
diff --git a/cmd/ormb/main.go b/cmd/ormb/main.go
@@ -15,7 +15,9 @@ limitations under the License.
 */
 package main
 
-import "github.com/kleveross/ormb/cmd/ormb/cmd"
+import (
+	"github.com/kleveross/ormb/cmd/ormb/cmd"
+)
 
 func main() {
 	cmd.Execute()
