From 1d1e0901490240d3aa1c7f099d4f0051920ec03d Mon Sep 17 00:00:00 2001
From: Manuel Carmona <manuel@sourced.tech>
Date: Tue, 11 Jul 2017 16:32:01 +0200
Subject: [PATCH] modified Makefile to include src-d/ci/Makefile.main

---
 .gitignore       |  2 ++
 Makefile         | 49 ++++++++++++++++++++++++------------------------
 cli/enry/main.go | 11 ++++++-----
 3 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3575102..bf8b345 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .linguist
 benchmarks/output
+.ci
+Makefile.main
diff --git a/Makefile b/Makefile
index 238674f..d17633b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,36 @@
-COVERAGE_REPORT := coverage.txt
-COVERAGE_PROFILE := profile.out
-COVERAGE_MODE := atomic
+# Package configuration
+PROJECT = enry
+COMMANDS = cli/enry
+
+# Including ci Makefile
+MAKEFILE = Makefile.main
+CI_REPOSITORY = https://github.com/src-d/ci.git
+CI_FOLDER = .ci
+
+# If you need to build more than one dockerfile, you can do so like this:
+# DOCKERFILES = Dockerfile_filename1:repositoryname1 Dockerfile_filename2:repositoryname2 ...
+
+$(MAKEFILE):
+	@git clone --quiet $(CI_REPOSITORY) $(CI_FOLDER); \
+	cp $(CI_FOLDER)/$(MAKEFILE) .;
+
+-include $(MAKEFILE)
 
 LINGUIST_PATH = .linguist
 
 # build CLI
-VERSION := $(shell git describe --tags --abbrev=0)
-COMMIT := $(shell git rev-parse --short HEAD)
-LDFLAGS = -s -X main.Version=$(VERSION) -X main.GitHash=$(COMMIT)
+LOCAL_TAG := $(shell git describe --tags --abbrev=0)
+LOCAL_COMMIT := $(shell git rev-parse --short HEAD)
+LOCAL_BUILD := $(shell date +"%m-%d-%Y_%H_%M_%S")
+LOCAL_LDFLAGS = -s -X main.version=$(LOCAL_TAG) -X main.build=$(LOCAL_BUILD) -X main.commit=$(LOCAL_COMMIT)
 
 $(LINGUIST_PATH):
 	git clone https://github.com/github/linguist.git $@
 
-test: $(LINGUIST_PATH)
-	go test -v ./...
+clean-linguist:
+	rm -rf $(LINGUIST_PATH)
 
-test-coverage: $(LINGUIST_PATH)
-	@echo "mode: $(COVERAGE_MODE)" > $(COVERAGE_REPORT); \
-		for dir in `find . -name "*.go" | grep -o '.*/' | sort -u | grep -v './fixtures/' | grep -v './.linguist/'`; do \
-			go test $$dir -coverprofile=$(COVERAGE_PROFILE) -covermode=$(COVERAGE_MODE); \
-			if [ $$? != 0 ]; then \
-				exit 2; \
-			fi; \
-			if [ -f $(COVERAGE_PROFILE) ]; then \
-				tail -n +2 $(COVERAGE_PROFILE) >> $(COVERAGE_REPORT); \
-				rm $(COVERAGE_PROFILE); \
-			fi; \
-	done;
+clean: clean-linguist
 
 code-generate: $(LINGUIST_PATH)
 	mkdir -p data
@@ -42,8 +46,5 @@ benchmarks-slow: $(LINGUST_PATH)
 	mkdir -p benchmarks/output && go test -run=NONE -bench=. -slow -benchtime=100ms -timeout=100h >benchmarks/output/enry_samples.bench && \
 	benchmarks/linguist-samples.rb 5 >benchmarks/output/linguist_samples.bench
 
-clean:
-	rm -rf $(LINGUIST_PATH)
-
 build-cli:
-	go build -o enry -ldflags "$(LDFLAGS)" cli/enry/main.go
+	go build -o enry -ldflags "$(LOCAL_LDFLAGS)" cli/enry/main.go
diff --git a/cli/enry/main.go b/cli/enry/main.go
index b48b27c..ec40af6 100644
--- a/cli/enry/main.go
+++ b/cli/enry/main.go
@@ -14,8 +14,9 @@ import (
 )
 
 var (
-	Version = "undefined"
-	GitHash = "undefined"
+	version = "undefined"
+	build   = "undefined"
+	commit  = "undefined"
 )
 
 func main() {
@@ -111,13 +112,13 @@ func main() {
 func usage() {
 	fmt.Fprintf(
 		os.Stderr,
-		`  %[1]s %[2]s commit: %[3]s
-  enry, A simple (and faster) implementation of github/linguist
+		`  %[1]s %[2]s build: %[3]s commit: %[4]s
+  %[1]s, A simple (and faster) implementation of github/linguist
   usage: %[1]s <path>
          %[1]s [-json] [-breakdown] <path>
          %[1]s [-json] [-breakdown]
 `,
-		os.Args[0], Version, GitHash,
+		os.Args[0], version, build, commit,
 	)
 }