Skip to content

Commit d0baed7

Browse files
committed
Merge branch 'master' into go-mod
2 parents 9207229 + fcbbc2a commit d0baed7

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ sudo: false
33
language: go
44

55
go:
6-
- 1.11
6+
- 1.11.x
77

88
script:
99
- go version

Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,22 @@
11
export GO111MODULE := on
22

3+
.PHONY: all
34
all: clean lint test
45

6+
.PHONY: test
57
test:
68
go test -v ./...
79

10+
.PHONY: lint
811
lint: testdeps
912
go vet ./...
1013
golint -set_exit_status ./...
1114

15+
.PHONY: testdeps
1216
testdeps:
1317
go get -d -v -t ./...
1418
GO111MODULE=off go get golang.org/x/lint/golint
1519

20+
.PHONY: clean
1621
clean:
1722
go clean
18-
19-
.PHONY: test lint testdeps clean

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ func main() {
7373

7474
## LICENSE
7575
```
76-
Copyright 2017 Hatena Co., Ltd.
76+
Copyright 2017-2019 Hatena Co., Ltd.
7777
7878
Licensed under the Apache License, Version 2.0 (the "License");
7979
you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)