Merge pull request #1037 from slingamn/githash.2

fix #1031

.goreleaser.yml

@@ -30,13 +30,18 @@ builds:
         goarch: arm64
     flags:
       - -trimpath
-archive:
+    # #1031: don't include the git hash in an official build
+    # default is: "-s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} -X main.builtBy=goreleaser"
+    ldflags:
+      - "-s -w -X main.build={{.Version}}"
+
+archives:
+  -
     name_template: "{{ .ProjectName }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
     format: tar.gz
     replacements:
-    386: i386
-    amd64: x64
-    darwin: osx
+      amd64: x86_64
+      darwin: macos
     format_overrides:
       - goos: windows
         format: zip

Makefile

@@ -1,14 +1,16 @@
 .PHONY: all install build release capdefs test smoke
 
+GIT_COMMIT := $(shell git rev-parse --short=16 HEAD 2> /dev/null)
+
 capdef_file = ./irc/caps/defs.go
 
 all: install
 
 install:
-	go install -v
+	go install -v -ldflags "-X main.commit=$(GIT_COMMIT)"
 
 build:
-	go build -v
+	go build -v -ldflags "-X main.commit=$(GIT_COMMIT)"
 
 release:
 	goreleaser --skip-publish --rm-dist