build process updates

Author: taraspos

.gitignore

@@ -1,3 +1,6 @@
 .vscode
 ofelia
 debug
+build
+bin
+*coverage*

.travis.yml

@@ -3,8 +3,13 @@ language: go
 sudo: false
 
 go:
-  - 1.9.x
-  - 1.10.x
+  - 1.11.x
+  - 1.12.x
+  - 1.13.x
+
+env:
+  global:
+    - GO111MODULE=on
 
 script:
   - make test-coverage

Makefile

@@ -1,14 +1,10 @@
 # Package configuration
 PROJECT = ofelia
 COMMANDS = ofelia
-DEPENDENCIES = golang.org/x/tools/cmd/cover
-PACKAGES = github.com/mcuadros/ofelia/core \
-	github.com/mcuadros/ofelia/middlewares \
-	github.com/mcuadros/ofelia/cli
 
 # Environment
 BASE_PATH := $(shell pwd)
-BUILD_PATH := $(BASE_PATH)/build
+BUILD_PATH := $(BASE_PATH)/bin
 SHA1 := $(shell git log --format='%H' -n 1 | cut -c1-10)
 BUILD := $(shell date +"%m-%d-%Y_%H_%M_%S")
 BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
@@ -22,10 +18,8 @@ PKG_TAG = latest
 # Go parameters
 GOCMD = go
 GOBUILD = $(GOCMD) build
-GOCLEAN = $(GOCMD) clean
-GOGET = $(GOCMD) get -v
-GOTEST = $(GOCMD) test -v
 GHRELEASE = github-release
+LDFLAGS = -ldflags "-X main.version=$(BRANCH) -X main.build=$(BUILD)" 
 
 # Coverage
 COVERAGE_REPORT = coverage.txt
@@ -38,38 +32,39 @@ endif
 # Rules
 all: clean packages
 
-dependencies:
-	@$(GOGET) -t ./...; \
-	for i in $(DEPENDENCIES); do $(GOGET) $$i; done
+.PHONY: test
+test: 
+	@go test -v ./...
 
-test: dependencies
-	@for p in $(PACKAGES); do \
-		$(GOTEST) $${p}; \
-	done;
+.PHONY: test-coverage
+test-coverage: 
+	@echo "mode: $(COVERAGE_MODE)" > $(COVERAGE_REPORT);
+	@go test -v ./... $${p} -coverprofile=tmp_$(COVERAGE_REPORT) -covermode=$(COVERAGE_MODE); 
+	cat tmp_$(COVERAGE_REPORT) | grep -v "mode: $(COVERAGE_MODE)" >> $(COVERAGE_REPORT); 
+	rm tmp_$(COVERAGE_REPORT); 
 
-test-coverage: dependencies
-	@echo "mode: $(COVERAGE_MODE)" > $(COVERAGE_REPORT); \
-	for p in $(PACKAGES); do \
-		$(GOTEST) $${p} -coverprofile=tmp_$(COVERAGE_REPORT) -covermode=$(COVERAGE_MODE); \
-		cat tmp_$(COVERAGE_REPORT) | grep -v "mode: $(COVERAGE_MODE)" >> $(COVERAGE_REPORT); \
-		rm tmp_$(COVERAGE_REPORT); \
-	done;
+build:
+	go build -o $(BUILD_PATH)/$(PROJECT) $${cmd}.go;
 
-packages: dependencies
+packages:
 	@for os in $(PKG_OS); do \
 		for arch in $(PKG_ARCH); do \
 			cd $(BASE_PATH); \
-			mkdir -p $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}; \
+			FINAL_PATH=$(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}; \
+			mkdir -p $${FINAL_PATH}; \
 			for cmd in $(COMMANDS); do \
-				GOOS=$${os} GOARCH=$${arch} $(GOCMD) build -ldflags "-X main.version=$(BRANCH) -X main.build=$(BUILD)" -o $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}/$${cmd} $${cmd}.go;\
+				BINARY=$(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}/$${cmd};\
+				GOOS=$${os} GOARCH=$${arch} $(GOCMD) build -ldflags "-X main.version=$(BRANCH) -X main.build=$(BUILD)" -o $${BINARY} $${cmd}.go;\
+				du -h $${BINARY};\
 			done; \
 			for content in $(PKG_CONTENT); do \
-				cp -rf $${content} $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}/; \
+				cp -rfv $${content} $(BUILD_PATH)/$(PROJECT)_$${os}_$${arch}/; \
 			done; \
-			cd  $(BUILD_PATH) && tar -cvzf $(BUILD_PATH)/$(PROJECT)_$(BRANCH)_$${os}_$${arch}.tar.gz $(PROJECT)_$${os}_$${arch}/; \
+			TAR_PATH=$(BUILD_PATH)/$(PROJECT)_$(BRANCH)_$${os}_$${arch}.tar.gz;\
+			cd  $(BUILD_PATH) && tar -cvzf $${TAR_PATH} $(PROJECT)_$${os}_$${arch}/; \
+			du -h $${TAR_PATH};\
 		done; \
 	done;
 
 clean:
-	@rm -rf $(BUILD_PATH); \
-	$(GOCLEAN) .
+	@rm -rf $(BUILD_PATH)

ofelia.go

@@ -4,9 +4,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/mcuadros/ofelia/cli"
-
 	"github.com/jessevdk/go-flags"
+	"github.com/mcuadros/ofelia/cli"
 )
 
 var version string