From 2d2df99f75595442ff4535a04c8e4c2353942337 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 8 Nov 2019 10:40:31 +0100 Subject: [PATCH 1/2] Run go mod tidy --- go.mod | 2 -- go.sum | 3 --- 2 files changed, 5 deletions(-) diff --git a/go.mod b/go.mod index 51b514b..5ffbfc3 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,6 @@ module gitea.hashru.nl/dsprenkels/rushlink go 1.12 require ( - github.com/go-bindata/go-bindata v3.1.2+incompatible // indirect - github.com/gorilla/handlers v1.4.2 github.com/gorilla/mux v1.7.3 github.com/pkg/errors v0.8.1 github.com/prometheus/client_golang v1.1.0 diff --git a/go.sum b/go.sum index 7009e20..3556000 100644 --- a/go.sum +++ b/go.sum @@ -6,7 +6,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-bindata/go-bindata v3.1.2+incompatible/go.mod h1:xK8Dsgwmeed+BBsSy2XTopBn/8uK2HWuGSnA11C3Joo= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= @@ -18,8 +17,6 @@ github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/gorilla/handlers v1.4.2 h1:0QniY0USkHQ1RGCLfKxeNHK9bkDHGRYGNDFBCS+YARg= -github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ= github.com/gorilla/mux v1.7.3 h1:gnP5JzjVOuiZD07fKKToCAOjS0yOpj/qPETTXCCS6hw= github.com/gorilla/mux v1.7.3/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= From 3e5eca40e3715cfddee6bfafc9c814779a9b0e70 Mon Sep 17 00:00:00 2001 From: Bart Schuurmans Date: Fri, 8 Nov 2019 10:40:53 +0100 Subject: [PATCH 2/2] Don't install/update go-bindata from //go:generate Instead, add build instructions to the README. --- README.md | 6 ++++++ handlers/views.go | 2 -- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f335743..f7a3a71 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,12 @@ A URL shortener and (maybe) a pastebin server for our #ru community. +## Build instructions + +- `go get -u github.com/go-bindata/go-bindata/...` +- `go generate ./...` +- `go build ./cmd/rushlink` + ## Libraries Use standard-Go-libraries if the job can be done with those. As of now, these diff --git a/handlers/views.go b/handlers/views.go index 74b9acb..2328f6d 100644 --- a/handlers/views.go +++ b/handlers/views.go @@ -1,7 +1,5 @@ package handlers -//go:generate go get github.com/go-bindata/go-bindata -//go:generate go get -u github.com/go-bindata/go-bindata/... //go:generate go-bindata -pkg $GOPACKAGE -prefix ../assets ../assets/... import (