From 322ff26694da1231d68273287ffe366543beec17 Mon Sep 17 00:00:00 2001 From: Marwan Sulaiman Date: Wed, 24 Oct 2018 17:34:06 -0400 Subject: [PATCH] Do not download modules during CI build (#815) * Do not download modules during CI build * install golint in non module system * Use vendor in tests + update vendor dir * mod tidy --- go.mod | 1 - scripts/check_golint.sh | 2 +- scripts/get_buffalo.sh | 2 +- scripts/get_dev_tools.sh | 2 +- scripts/test_unit.sh | 2 +- vendor/github.com/gobuffalo/tags/shoulders.md | 34 +++++++++++++++++++ vendor/github.com/gobuffalo/tags/version.go | 3 ++ 7 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 vendor/github.com/gobuffalo/tags/shoulders.md create mode 100644 vendor/github.com/gobuffalo/tags/version.go diff --git a/go.mod b/go.mod index d6023584..f339f8d3 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,6 @@ require ( github.com/go-playground/universal-translator v0.16.0 // indirect github.com/gobuffalo/buffalo v0.13.1 github.com/gobuffalo/envy v1.6.5 - github.com/gobuffalo/mw-csrf v0.0.0-20180802151833-446ff26e108b github.com/gobuffalo/mw-forcessl v0.0.0-20180802152810-73921ae7a130 github.com/gobuffalo/mw-paramlogger v0.0.0-20181005191442-d6ee392ec72e github.com/gobuffalo/suite v2.1.6+incompatible diff --git a/scripts/check_golint.sh b/scripts/check_golint.sh index 83845747..60d0cf60 100755 --- a/scripts/check_golint.sh +++ b/scripts/check_golint.sh @@ -4,4 +4,4 @@ # Run the linter on everything except generated code set -euo pipefail -GO111MODULE=on golint -set_exit_status $(GO111MODULE=on go list ./... | grep -v '/mocks') +golint -set_exit_status $(GO111MODULE=off go list ./... | grep -v '/mocks') diff --git a/scripts/get_buffalo.sh b/scripts/get_buffalo.sh index 4e35a0e0..3ac973a2 100755 --- a/scripts/get_buffalo.sh +++ b/scripts/get_buffalo.sh @@ -21,6 +21,6 @@ true) rm -r $TMPDIR ;; *) - GO111MODULE=on go get github.com/gobuffalo/buffalo/buffalo + go get github.com/gobuffalo/buffalo/buffalo ;; esac diff --git a/scripts/get_dev_tools.sh b/scripts/get_dev_tools.sh index 21e81c7d..8ecf5ec2 100755 --- a/scripts/get_dev_tools.sh +++ b/scripts/get_dev_tools.sh @@ -4,6 +4,6 @@ # Ensure that the tools needed to build locally are present set -xeuo pipefail -GO111MODULE=on go get golang.org/x/lint/golint +GO111MODULE=off go get golang.org/x/lint/golint ./scripts/get_buffalo.sh diff --git a/scripts/test_unit.sh b/scripts/test_unit.sh index b6327a0a..1b3b4ddf 100755 --- a/scripts/test_unit.sh +++ b/scripts/test_unit.sh @@ -18,4 +18,4 @@ export GO111MODULE=on # Run the unit tests with the race detector and code coverage enabled set -xeuo pipefail -go test -mod=readonly -race -coverprofile cover.out -covermode atomic ./... +go test -mod=vendor -race -coverprofile cover.out -covermode atomic ./... diff --git a/vendor/github.com/gobuffalo/tags/shoulders.md b/vendor/github.com/gobuffalo/tags/shoulders.md new file mode 100644 index 00000000..a3f2c697 --- /dev/null +++ b/vendor/github.com/gobuffalo/tags/shoulders.md @@ -0,0 +1,34 @@ +# github.com/gobuffalo/tags Stands on the Shoulders of Giants + +github.com/gobuffalo/tags does not try to reinvent the wheel! Instead, it uses the already great wheels developed by the Go community and puts them all together in the best way possible. Without these giants this project would not be possible. Please make sure to check them out and thank them for all of their hard work. + +Thank you to the following **GIANTS**: + + +* [github.com/fatih/structs](https://godoc.org/github.com/fatih/structs) + +* [github.com/gobuffalo/envy](https://godoc.org/github.com/gobuffalo/envy) + +* [github.com/gobuffalo/uuid](https://godoc.org/github.com/gobuffalo/uuid) + +* [github.com/gobuffalo/validate](https://godoc.org/github.com/gobuffalo/validate) + +* [github.com/joho/godotenv](https://godoc.org/github.com/joho/godotenv) + +* [github.com/kr/pretty](https://godoc.org/github.com/kr/pretty) + +* [github.com/kr/text](https://godoc.org/github.com/kr/text) + +* [github.com/markbates/inflect](https://godoc.org/github.com/markbates/inflect) + +* [github.com/pkg/errors](https://godoc.org/github.com/pkg/errors) + +* [github.com/stretchr/testify/assert](https://godoc.org/github.com/stretchr/testify/assert) + +* [github.com/stretchr/testify/require](https://godoc.org/github.com/stretchr/testify/require) + +* [github.com/stretchr/testify/vendor/github.com/davecgh/go-spew/spew](https://godoc.org/github.com/stretchr/testify/vendor/github.com/davecgh/go-spew/spew) + +* [github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib](https://godoc.org/github.com/stretchr/testify/vendor/github.com/pmezard/go-difflib/difflib) + +* [gopkg.in/check.v1](https://godoc.org/gopkg.in/check.v1) diff --git a/vendor/github.com/gobuffalo/tags/version.go b/vendor/github.com/gobuffalo/tags/version.go new file mode 100644 index 00000000..7b2b8d4b --- /dev/null +++ b/vendor/github.com/gobuffalo/tags/version.go @@ -0,0 +1,3 @@ +package tags + +const Version = "v2.0.11"