Skip to content

Commit e550631

Browse files
authored
Merge pull request #61 from tevino/fix-make
Fix make
2 parents 0ba3cd1 + b027950 commit e550631

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ go_import_path: gopkg.in/src-d/go-license-detector.v2
66
go:
77
- 1.11.x
88
- 1.12.x
9+
- 1.13.x
910

1011
matrix:
1112
fast_finish: true
@@ -16,6 +17,7 @@ before_install:
1617

1718
install:
1819
- export GO111MODULE=on
20+
- make
1921
- go mod vendor
2022
- go build -v gopkg.in/src-d/go-license-detector.v2/cmd/license-detector
2123

@@ -33,7 +35,7 @@ jobs:
3335
include:
3436
- stage: deploy
3537
os: osx
36-
go: 1.12.x
38+
go: 1.13.x
3739
after_success:
3840
- gzip -S .darwin_amd64.gz license-detector
3941
script: skip
@@ -47,7 +49,7 @@ jobs:
4749
tags: true
4850
- stage: deploy
4951
os: linux
50-
go: 1.12.x
52+
go: 1.13.x
5153
script: skip
5254
after_success:
5355
- gzip -S .linux_amd64.gz license-detector

Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ licensedb/internal/assets/bindata.go: licenses.tar urls.csv names.csv $(GOPATH)/
1010
licenses.tar: license-list-data.tar.gz
1111
tar -xf license-list-data.tar.gz license-list-data-$(SPDX_DATA_VERSION)/text
1212
tar -cf licenses.tar -C license-list-data-$(SPDX_DATA_VERSION)/text .
13-
rm -rf license-list-data-$(SPDX_DATA_VERSION)
1413

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

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

0 commit comments

Comments
 (0)