Skip to content

Commit

Permalink
(#53) Upgrade to Go 1.13 (#54)
Browse files Browse the repository at this point in the history
  • Loading branch information
llorllale authored Sep 14, 2019
1 parent dc26687 commit e79a964
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 8 deletions.
5 changes: 4 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
service:
# project-path: github.com/llorllale/go-gitlint
golangci-lint-version: 1.14.x
# @todo #53 upgrade golangci-lint-version to 1.18.x once their docker image is ready
# - see https://github.com/golangci/golangci-lint/issues/682. For now, linting on
# local is against 1.18.x vs their service on 1.17.x.
golangci-lint-version: 1.17.x
# prepare:
# - make deps
# - make generate
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`)

2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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

1 comment on commit e79a964

@0pdd
Copy link

@0pdd 0pdd commented on e79a964 Sep 14, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Puzzle 53-2f5f2d13 discovered in .golangci.yml and submitted as #55. Please, remember that the puzzle was not necessarily added in this particular commit. Maybe it was added earlier, but we discovered it only now.

Please sign in to comment.