Skip to content

Commit

Permalink
Merge pull request #61 from tevino/fix-make
Browse files Browse the repository at this point in the history
Fix make
  • Loading branch information
vmarkovtsev authored Sep 12, 2019
2 parents 0ba3cd1 + b027950 commit e550631
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ go_import_path: gopkg.in/src-d/go-license-detector.v2
go:
- 1.11.x
- 1.12.x
- 1.13.x

matrix:
fast_finish: true
Expand All @@ -16,6 +17,7 @@ before_install:

install:
- export GO111MODULE=on
- make
- go mod vendor
- go build -v gopkg.in/src-d/go-license-detector.v2/cmd/license-detector

Expand All @@ -33,7 +35,7 @@ jobs:
include:
- stage: deploy
os: osx
go: 1.12.x
go: 1.13.x
after_success:
- gzip -S .darwin_amd64.gz license-detector
script: skip
Expand All @@ -47,7 +49,7 @@ jobs:
tags: true
- stage: deploy
os: linux
go: 1.12.x
go: 1.13.x
script: skip
after_success:
- gzip -S .linux_amd64.gz license-detector
Expand Down
3 changes: 1 addition & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ licensedb/internal/assets/bindata.go: licenses.tar urls.csv names.csv $(GOPATH)/
licenses.tar: license-list-data.tar.gz
tar -xf license-list-data.tar.gz license-list-data-$(SPDX_DATA_VERSION)/text
tar -cf licenses.tar -C license-list-data-$(SPDX_DATA_VERSION)/text .
rm -rf license-list-data-$(SPDX_DATA_VERSION)

license-list-data-$(SPDX_DATA_VERSION)/json/details: license-list-data.tar.gz
tar -xf license-list-data.tar.gz license-list-data-$(SPDX_DATA_VERSION)/json/details
Expand All @@ -25,4 +24,4 @@ license-list-data.tar.gz:
curl -SLk -o license-list-data.tar.gz https://github.com/spdx/license-list-data/archive/v$(SPDX_DATA_VERSION).tar.gz

$(GOPATH)/bin/go-bindata:
go get -v github.com/jteeuwen/go-bindata/...
go get -v github.com/jteeuwen/go-bindata/go-bindata@6025e8de665b31fa74ab1a66f2cddd8c0abf887e

0 comments on commit e550631

Please sign in to comment.