You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

48 lines
1.6 KiB

Index: src/github.com/wal-g/wal-g/Makefile
--- src/github.com/wal-g/wal-g/Makefile.orig 2018-10-27 13:42:37.000000000 +0200
+++ src/github.com/wal-g/wal-g/Makefile 2018-10-27 13:54:52.065585000 +0200
@@ -1,12 +1,14 @@
CMD_FILES = $(wildcard cmd/wal-g/*.go)
PKG_FILES = $(wildcard *.go)
-.PHONY : fmt test install all clean
+.PHONY : all
ifdef GOTAGS
override GOTAGS := -tags $(GOTAGS)
endif
+all: cmd/wal-g/wal-g
+
test: cmd/wal-g/wal-g
go list ./... | grep -v 'vendor/' | xargs go vet
go test -v ./walg_test/
@@ -15,8 +17,6 @@
fmt: $(CMD_FILES) $(PKG_FILES)
gofmt -s -w $(CMD_FILES) $(PKG_FILES)
-all: cmd/wal-g/wal-g
-
install:
(cd cmd/wal-g && go install)
@@ -26,4 +26,4 @@
(cd cmd/wal-g && go clean)
cmd/wal-g/wal-g: $(CMD_FILES) $(PKG_FILES)
- (cd cmd/wal-g && go build $(GOTAGS) -ldflags "-s -w -X main.BuildDate=`date -u +%Y.%m.%d_%H:%M:%S` -X main.GitRevision=`git rev-parse --short HEAD` -X main.WalgVersion=`git tag -l --points-at HEAD`")
+ (cd cmd/wal-g && go build $(GOTAGS) -x -ldflags "-s -w -X main.BuildDate=`date -u +%Y.%m.%d_%H:%M:%S` -X main.GitRevision=`git rev-parse --short HEAD` -X main.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 2018-10-27 13:42:37.000000000 +0200
+++ src/github.com/wal-g/wal-g/build.sh 2018-10-27 13:43:30.405816000 +0200
@@ -19,9 +19,3 @@
cd $CWD
make
-cp ./cmd/wal-g/wal-g ./docker/pg
-docker-compose build
-docker-compose up --exit-code-from pg
-rm -rf vendor/github.com/google/brotli/*
-mv .brotli.tmp/* vendor/github.com/google/brotli/
-rm -rf .brotli.tmp