Index: src/github.com/wal-g/wal-g/Makefile --- src/github.com/wal-g/wal-g/Makefile.orig 2019-03-24 21:01:23.000000000 +0100 +++ src/github.com/wal-g/wal-g/Makefile 2019-03-24 21:06:59.821698000 +0100 @@ -4,12 +4,14 @@ TEST_FILES = $(wildcard test/*.go testtools/*.go) PKG := github.com/wal-g/wal-g -.PHONY: test fmt lint all install clean +.PHONY: all ifdef GOTAGS override GOTAGS := -tags $(GOTAGS) endif +all: build + test: build go list ./... | grep -Ev 'vendor|submodules|tmp' | xargs go vet go test -v ./test/ @@ -26,11 +28,7 @@ lint: $(CMD_FILES) $(PKG_FILES) $(TEST_FILES) go list ./... | grep -Ev 'vendor|submodules|tmp' | xargs golint -all: build - deps: - git submodule update --init - dep ensure install: (cd $(MAIN_PATH) && go install) @@ -39,4 +37,4 @@ (cd $(MAIN_PATH) && go clean) build: $(CMD_FILES) $(PKG_FILES) - (cd $(MAIN_PATH) && go build $(GOTAGS) -ldflags "-s -w -X github.com/wal-g/wal-g/cmd.BuildDate=`date -u +%Y.%m.%d_%H:%M:%S` -X github.com/wal-g/wal-g/cmd.GitRevision=`git rev-parse --short HEAD` -X github.com/wal-g/wal-g/cmd.WalgVersion=`git tag -l --points-at HEAD`") + (cd $(MAIN_PATH) && go build -v $(GOTAGS) -ldflags "-X github.com/wal-g/wal-g/cmd.BuildDate=`date -u +%Y.%m.%d_%H:%M:%S` -X github.com/wal-g/wal-g/cmd.GitRevision=`git rev-parse --short HEAD` -X github.com/wal-g/wal-g/cmd.WalgVersion=`git tag -l --points-at HEAD`") Index: src/github.com/wal-g/wal-g/build.sh --- src/github.com/wal-g/wal-g/build.sh.orig 2019-03-24 21:01:23.000000000 +0100 +++ src/github.com/wal-g/wal-g/build.sh 2019-03-24 21:06:35.357296000 +0100 @@ -1,12 +1,6 @@ #!/bin/sh set -e -x -if ! which dep > /dev/null; then - go get -u github.com/golang/dep/cmd/dep # install dependencies management system -fi - -make deps # install dependencies - test -d tmp || mkdir tmp cp -rf vendor/github.com/google/brotli/* tmp/ @@ -32,9 +26,3 @@ cd ${CWD} make -rm -rf vendor/github.com/google/brotli/* -mv tmp/* vendor/github.com/google/brotli/ -rm -rf tmp/ - -docker-compose build -docker-compose up --exit-code-from pg pg