From 968e2cba7771f7cebd06ca7ca9552f6101f4cbab Mon Sep 17 00:00:00 2001 From: Eran Levy Date: Sat, 25 Jul 2020 22:12:18 +0300 Subject: [PATCH 1/3] issue/#1268: align go version to 1.14 --- cmd/golangci-lint/mod_version.go | 19 ------------------- go.mod | 2 +- tools/go.mod | 2 +- 3 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 cmd/golangci-lint/mod_version.go diff --git a/cmd/golangci-lint/mod_version.go b/cmd/golangci-lint/mod_version.go deleted file mode 100644 index 7b596728e169..000000000000 --- a/cmd/golangci-lint/mod_version.go +++ /dev/null @@ -1,19 +0,0 @@ -// +build go1.12 - -package main - -import ( - "fmt" - "runtime/debug" -) - -//nolint:gochecknoinits -func init() { - if info, available := debug.ReadBuildInfo(); available { - if date == "" { - version = info.Main.Version - commit = fmt.Sprintf("(unknown, mod sum: %q)", info.Main.Sum) - date = "(unknown)" - } - } -} diff --git a/go.mod b/go.mod index fc9d4b33b942..d8aaeeac8856 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/golangci/golangci-lint -go 1.12 +go 1.14 require ( github.com/Djarvur/go-err113 v0.0.0-20200511133814-5174e21577d5 diff --git a/tools/go.mod b/tools/go.mod index fa27237f8b2e..036a593950f8 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -1,6 +1,6 @@ module github.com/golangci/golangci-lint/tools -go 1.12 +go 1.14 require ( github.com/goreleaser/godownloader v0.1.0 From e802f756483699fd53ee60ec974c492fbcc43e0d Mon Sep 17 00:00:00 2001 From: Eran Levy Date: Sat, 25 Jul 2020 22:24:48 +0300 Subject: [PATCH 2/3] issue/#1268: align go version to 1.14 --- tools/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/go.mod b/tools/go.mod index 036a593950f8..bce238064364 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -7,5 +7,5 @@ require ( github.com/goreleaser/goreleaser v0.136.0 ) -// Fix invalid pseudo-version: revision is longer than canonical (6fd6a9bfe14e) +// Fix invalid pseudo-version: revision is longer than canonical (6fd6a9bfe14e) replace github.com/go-macaron/cors => github.com/go-macaron/cors v0.0.0-20190418220122-6fd6a9bfe14e From f8ebf6c17b3607d1fbe9bc16dc6ed8c99b2cefec Mon Sep 17 00:00:00 2001 From: eran-levy Date: Sat, 25 Jul 2020 22:24:48 +0300 Subject: [PATCH 3/3] issue/#1268: align go version to 1.14 --- tools/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/go.mod b/tools/go.mod index 036a593950f8..bce238064364 100644 --- a/tools/go.mod +++ b/tools/go.mod @@ -7,5 +7,5 @@ require ( github.com/goreleaser/goreleaser v0.136.0 ) -// Fix invalid pseudo-version: revision is longer than canonical (6fd6a9bfe14e) +// Fix invalid pseudo-version: revision is longer than canonical (6fd6a9bfe14e) replace github.com/go-macaron/cors => github.com/go-macaron/cors v0.0.0-20190418220122-6fd6a9bfe14e