Skip to content
Permalink
Browse files

fix build

  • Loading branch information
mlapshin committed Jan 13, 2020
1 parent 8a639ad commit 9d35a3864badea30be99f6cc31358b7c9e6e4a9a
Showing with 10 additions and 216 deletions.
  1. +3 −1 .travis.yml
  2. +3 −11 Makefile
  3. +2 −1 go.mod
  4. +2 −203 go.sum
@@ -25,6 +25,8 @@ script:
- GOOS=windows GOARCH=amd64 BINSUFFIX=-windows-amd64.exe make
- GOOS=windows GOARCH=386 BINSUFFIX=-windows-386.exe make
- GOOS=darwin GOARCH=amd64 BINSUFFIX=-darwin-amd64 make
- echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
- "[ ! -z \"$TRAVIS_TAG\" ] && make docker || echo 'non-tag build'"

before_install:
- curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
- curl -L https://github.com/tcnksm/ghr/releases/download/v0.12.0/ghr_v0.12.0_linux_amd64.tar.gz --output ghr.tar.gz && tar zxvf ghr.tar.gz
@@ -10,7 +10,7 @@ GOFMT = gofmt

.PHONY: all
all: a_main-packr.go lint fmt | $(BASE)
$Q cd $(BASE) && $(GO) build \
$(GO) build \
-v \
-tags release \
-ldflags '-X "main.Version=$(VERSION)" -X "main.BuildDate=$(DATE)"' \
@@ -23,24 +23,16 @@ a_main-packr.go: $(GOPATH)/bin/packr
go clean -modcache; \
$(GOPATH)/bin/packr -z


$(BASE):
@mkdir -p $(dir $@)
@ln -sf $(CURDIR) $@

# # install packr with go get because dep doesn't build binaries for us
$(GOPATH)/bin/packr:
$(GO) get -u github.com/gobuffalo/packr/...
cd $(GOPATH)/pkg/mod/github.com/gobuffalo/packr\@v1.26.1-0.20190624180515-bded308e56b4/ && $(GO) install ./packr

# Tools

.PHONY: packr
packr: $(GOPATH)/bin/packr
rm -rfv $(GOPATH)/src/golang.org/x/tools/go/loader/testdata; \
rm -rfv $(GOPATH)/src/golang.org/x/tools/cmd/fiximports/testdata; \
rm -rfv $(GOPATH)/src/golang.org/x/tools/internal/lsp/testdata; \
go clean -modcache; \
$(GOPATH)/bin/packr -z

.PHONY: lint
lint: $(BASE) $(GOLINT)
$Q cd $(BASE) && ret=0 && for pkg in $(PKGS); do \
3 go.mod
@@ -12,7 +12,7 @@ require (
github.com/gobuffalo/genny v0.6.0 // indirect
github.com/gobuffalo/mapi v1.2.0 // indirect
github.com/gobuffalo/meta v0.2.1 // indirect
github.com/gobuffalo/packr v1.30.1
github.com/gobuffalo/packr v1.26.1-0.20190624180515-bded308e56b4
github.com/gobuffalo/syncx v0.1.0 // indirect
github.com/google/go-cmp v0.2.0
github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf
@@ -33,5 +33,6 @@ require (
github.com/vbauerster/mpb v3.3.2+incompatible
golang.org/x/crypto v0.0.0-20200109152110-61a87790db17 // indirect
golang.org/x/sys v0.0.0-20200107162124-548cf772de50 // indirect
golang.org/x/text v0.3.2 // indirect
golang.org/x/tools v0.0.0-20200113040837-eac381796e91 // indirect
)

0 comments on commit 9d35a38

Please sign in to comment.
You can’t perform that action at this time.