From 7eb2dfd4e36480b04e5f824450234228210a4d35 Mon Sep 17 00:00:00 2001
From: Jarek Kowalski <jaak@jkowalski.net>
Date: Sat, 30 Jul 2016 14:00:49 -0700
Subject: [PATCH] dump build dependencies in travis

---
 Makefile                       | 15 ++++++++-------
 cmd/kopia/command_buildinfo.go | 24 ------------------------
 cmd/kopia/main.go              |  3 ++-
 3 files changed, 10 insertions(+), 32 deletions(-)
 delete mode 100644 cmd/kopia/command_buildinfo.go

diff --git a/Makefile b/Makefile
index 50f4d592b..b19bcea83 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ BUILD_INFO ?= $(USER)@$(shell hostname -s)_$(shell date +%Y%m%d_%H%M%S)
 RELEASE_SUFFIX ?= $(shell go env GOOS)-$(shell go env GOARCH)
 RELEASE_VERSION ?= $(BUILD_VERSION)-$(RELEASE_SUFFIX)
 RELEASE_NAME = kopia-$(RELEASE_VERSION)
-LDARGS="-X main.buildVersion=$(BUILD_VERSION) -X main.buildInfo=$(BUILD_INFO)"
+LDARGS="-X main.buildVersion=$(BUILD_VERSION)"
 RELEASE_TMP_DIR = $(CURDIR)/.release
 RELEASES_OUT_DIR = $(CURDIR)/.releases
 ZIP ?= 0
@@ -44,14 +44,15 @@ travis-setup: deps dev-deps
 
 travis-release:
 	mkdir -p $(RELEASES_OUT_DIR)
-	GOARCH=386 GOOS=windows EXE_SUFFIX=.exe RELEASE_SUFFIX=windows-x86 BUILD_INFO=$(BUILD_INFO) make release
-	GOARCH=amd64 GOOS=windows EXE_SUFFIX=.exe RELEASE_SUFFIX=windows-x64 BUILD_INFO=$(BUILD_INFO) make release
-	GOARCH=386 GOOS=linux RELEASE_SUFFIX=linux-x86 BUILD_INFO=$(BUILD_INFO) make release
-	GOARCH=amd64 GOOS=linux RELEASE_SUFFIX=linux-x64 BUILD_INFO=$(BUILD_INFO) make release
-	GOARCH=amd64 GOOS=darwin RELEASE_SUFFIX=macosx-x64 BUILD_INFO=$(BUILD_INFO) make release
-	GOARCH=arm GOOS=linux RELEASE_SUFFIX=linux-arm BUILD_INFO=$(BUILD_INFO) make release
+	GOARCH=386 GOOS=windows EXE_SUFFIX=.exe RELEASE_SUFFIX=windows-x86 make release
+	GOARCH=amd64 GOOS=windows EXE_SUFFIX=.exe RELEASE_SUFFIX=windows-x64 make release
+	GOARCH=386 GOOS=linux RELEASE_SUFFIX=linux-x86 make release
+	GOARCH=amd64 GOOS=linux RELEASE_SUFFIX=linux-x64 make release
+	GOARCH=amd64 GOOS=darwin RELEASE_SUFFIX=macosx-x64 make release
+	GOARCH=arm GOOS=linux RELEASE_SUFFIX=linux-arm make release
 	rm -rf $(RELEASE_TMP_DIR)
 	(cd $(RELEASES_OUT_DIR) && sha256sum kopia-* > CHECKSUM)
+	(cd ../../.. && find  -name .git | xargs -Izzz /bin/bash -c "(cd zzz && echo -n 'zzz: ' && git describe --always --long --abbrev=40)") | sort > $(RELEASES_OUT_DIR)/BUILD_VERSIONS
 
 dev-deps:
 	go get -u golang.org/x/tools/cmd/gorename
diff --git a/cmd/kopia/command_buildinfo.go b/cmd/kopia/command_buildinfo.go
deleted file mode 100644
index f2faea3f4..000000000
--- a/cmd/kopia/command_buildinfo.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"gopkg.in/alecthomas/kingpin.v2"
-)
-
-var (
-	buildInfoCommand = app.Command("buildinfo", "Show build information").Hidden()
-
-	buildVersion = "UNKNOWN"
-	buildInfo    = "UNKNOWN"
-)
-
-func init() {
-	buildInfoCommand.Action(runBuildInfoCommand)
-}
-
-func runBuildInfoCommand(context *kingpin.ParseContext) error {
-	fmt.Println("Version:", buildVersion)
-	fmt.Println("Build Information:", buildInfo)
-	return nil
-}
diff --git a/cmd/kopia/main.go b/cmd/kopia/main.go
index bf8c0debd..a8e2ba52b 100644
--- a/cmd/kopia/main.go
+++ b/cmd/kopia/main.go
@@ -17,7 +17,8 @@
 )
 
 var (
-	app = kingpin.New("kopia", "Kopia - Online Backup").Author("http://kopia.github.io/")
+	app          = kingpin.New("kopia", "Kopia - Online Backup").Author("http://kopia.github.io/")
+	buildVersion = "UNKNOWN"
 )
 
 func main() {