aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-09-21 10:57:40 +0200
committerMartin Polden <mpolden@mpolden.no>2019-09-21 10:57:40 +0200
commiteb20b00d143052901a926f8e72f693f32858285b (patch)
treee4054d09f4eb01207fd533bf0756d0571d5941f8
parent7b3f7b90f9e150a770bea0d39bc83edcadb73ef8 (diff)
Switch to modules
-rw-r--r--Makefile10
-rw-r--r--go.mod8
-rw-r--r--go.sum4
-rw-r--r--tools/go.mod5
-rw-r--r--tools/go.sum7
-rw-r--r--tools/tools.go8
6 files changed, 35 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 4d8a3c7..bf30354 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: deps test vet lint install
+all: test vet lint install
fmt:
go fmt ./...
@@ -10,13 +10,9 @@ vet:
go vet ./...
lint:
- golint 2> /dev/null; if [ $$? -eq 127 ]; then \
- go get -v github.com/golang/lint/golint; \
- fi
+ cd tools && \
+ go list -tags tools -f '{{range $$i := .Imports}}{{printf "%s\n" $$i}}{{end}}' | xargs go install
golint ./...
-deps:
- go get -d -v ./...
-
install:
go install ./...
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..92f3f7e
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,8 @@
+module github.com/mpolden/atbapi
+
+go 1.13
+
+require (
+ github.com/jessevdk/go-flags v1.4.0
+ github.com/pmylund/go-cache v2.1.0+incompatible
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..9e1b8fe
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,4 @@
+github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/pmylund/go-cache v2.1.0+incompatible h1:n+7K51jLz6a3sCvff3BppuCAkixuDHuJ/C57Vw/XjTE=
+github.com/pmylund/go-cache v2.1.0+incompatible/go.mod h1:hmz95dGvINpbRZGsqPcd7B5xXY5+EKb5PpGhQY3NTHk=
diff --git a/tools/go.mod b/tools/go.mod
new file mode 100644
index 0000000..6fdb5cf
--- /dev/null
+++ b/tools/go.mod
@@ -0,0 +1,5 @@
+module tools
+
+go 1.13
+
+require golang.org/x/lint v0.0.0-20190409202823-959b441ac422
diff --git a/tools/go.sum b/tools/go.sum
new file mode 100644
index 0000000..c472d8f
--- /dev/null
+++ b/tools/go.sum
@@ -0,0 +1,7 @@
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd h1:/e+gpKk9r3dJobndpTytxS2gOy6m5uvpg+ISQoEcusQ=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
diff --git a/tools/tools.go b/tools/tools.go
new file mode 100644
index 0000000..3738269
--- /dev/null
+++ b/tools/tools.go
@@ -0,0 +1,8 @@
+// +build tools
+
+package tools
+
+import (
+ // Pin versions of these tools by having an unused import
+ _ "golang.org/x/lint/golint"
+)