From 7537148cfe78b85d98fee8aae200c14b8fb0ff9f Mon Sep 17 00:00:00 2001 From: Charles JUDITH Date: Mon, 8 Jan 2018 16:13:41 +0100 Subject: [PATCH] Refactoring for promu settings - Remove useless targets in Makefile - Fix grep in .promu.yml - Add .travis.yml --- .promu.yml | 1 - .travis.yml | 11 +++++++---- Makefile | 8 +------- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/.promu.yml b/.promu.yml index cab3b4b..ceb6356 100644 --- a/.promu.yml +++ b/.promu.yml @@ -14,7 +14,6 @@ build: tarball: files: - LICENSE - - NOTICE crossbuild: platforms: - linux/amd64 diff --git a/.travis.yml b/.travis.yml index 8868756..8a19fb9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,13 @@ language: go go: - - 1.7.x - - 1.8.x - - master +- 1.7.x +- 1.8.x +- master matrix: allow_failures: - - go: master +- go: master + +script: +- make style test diff --git a/Makefile b/Makefile index e0fee48..47b833d 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ GO := GO15VENDOREXPERIMENT=1 go PROMU := $(GOPATH)/bin/promu -pkgs = $(shell $(GO) list ./... | grep -v -E '/vendor/|/ui') +pkgs = $(shell $(GO) list ./... | grep -v -E '/vendor/') PREFIX ?= $(shell pwd) BIN_DIR ?= $(shell pwd) @@ -42,16 +42,10 @@ docker: @echo ">> building docker image" @docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" . -assets: - @echo ">> writing assets" - -@$(GO) get -u github.com/jteeuwen/go-bindata/... - promu: @GOOS=$(shell uname -s | tr A-Z a-z) \ GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \ $(GO) get -u github.com/prometheus/promu -proto: - .PHONY: all style format build test vet assets tarball docker promu proto