diff --git a/.golangci.yml b/.golangci.yml index c125da5..c0611e4 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ service: # project-path: github.com/llorllale/go-gitlint - golangci-lint-version: 1.14.x + golangci-lint-version: 1.17.x # prepare: # - make deps # - make generate diff --git a/.travis.yml b/.travis.yml index ed959d9..c9022a0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,12 +2,12 @@ dist: trusty language: go go: - - "1.11.x" + - "1.13.x" env: - GO111MODULE=on install: - gem install pdd - - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.14.0 + - curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.18.0 - GO111MODULE=off go get github.com/comcast/weasel jobs: include: diff --git a/Makefile b/Makefile index 1d22dc0..870a0d9 100644 --- a/Makefile +++ b/Makefile @@ -35,13 +35,13 @@ coverage: ./check_coverage.sh lint: - ./bin/golangci-lint run + golangci-lint run pdd: pdd --file=puzzles.xml license: - ${GOPATH}/bin/weasel + weasel checks: build lint pdd license test coverage diff --git a/README.md b/README.md index 0843100..57e9947 100644 --- a/README.md +++ b/README.md @@ -82,9 +82,9 @@ Fork this repo, make sure `make checks` works, **and then** open a PR. ## Build dependencies To run `make checks` you will need: -* Go `1.11.x` +* Go `1.13.x` * Ruby 2.x (for `pdd`) * [pdd](https://github.com/yegor256/pdd) (a ruby gem - `gem install pdd`) -* [golangci-lint](https://github.com/golangci/golangci-lint) v1.14.0 (expected to be in the `./bin` folder) -* [weasel](https://github.com/comcast/weasel) (`go get github.com/comcast/weasel`) +* [golangci-lint](https://github.com/golangci/golangci-lint) v1.18.0 in your `$PATH` (`curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b $(go env GOPATH)/bin v1.18.0`) +* [weasel](https://github.com/comcast/weasel) in your `$PATH` (`go get github.com/comcast/weasel`) diff --git a/go.mod b/go.mod index 66e19ac..c8a0cf3 100644 --- a/go.mod +++ b/go.mod @@ -11,3 +11,5 @@ require ( gopkg.in/alecthomas/kingpin.v2 v2.2.6 gopkg.in/src-d/go-git.v4 v4.10.0 ) + +go 1.13