Skip to content

Commit 0971d29

Browse files
committed
improve travis matrix
1 parent e311008 commit 0971d29

File tree

5 files changed

+34
-12
lines changed

5 files changed

+34
-12
lines changed

.travis.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
language: go
2+
3+
sudo: false
4+
25
go:
36
- 1.1
47
- 1.2
58
- 1.3
69
- 1.4
7-
install:
8-
- go get github.com/stretchr/testify/assert
9-
script:
10-
- go test -v
10+
- 1.5
11+
- 1.6
12+
13+
install: make install
14+
15+
script: make test

Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
.PHONY: test run update format install
2+
3+
install:
4+
go get github.com/stretchr/testify/assert
5+
go list -f '{{range .Imports}}{{.}} {{end}}' ./... | xargs go get -v
6+
go list -f '{{range .TestImports}}{{.}} {{end}}' ./... | xargs go get -v
7+
8+
update:
9+
go get -u all
10+
11+
format:
12+
gofmt -l -w -s .
13+
go fix ./...
14+
15+
test:
16+
go test -v ./...
17+
go vet ./...
18+
exit `gofmt -l -s -e . | wc -l`

events.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ func (g *Gitlab) Activity() (ActivityFeed, error) {
4141

4242
contents, err := g.buildAndExecRequest("GET", url, nil)
4343
if err != nil {
44-
fmt.Println("%s", err)
44+
fmt.Printf("%s\n", err.Error())
4545
}
4646

4747
var activity ActivityFeed
4848
err = xml.Unmarshal(contents, &activity)
4949
if err != nil {
50-
fmt.Println("%s", err)
50+
fmt.Printf("%s\n", err.Error())
5151
}
5252

5353
return activity, err
@@ -59,13 +59,13 @@ func (g *Gitlab) RepoActivityFeed(feedPath string) ActivityFeed {
5959

6060
contents, err := g.buildAndExecRequest("GET", url, nil)
6161
if err != nil {
62-
fmt.Println("%s", err)
62+
fmt.Printf("%s\n", err)
6363
}
6464

6565
var activity ActivityFeed
6666
err = xml.Unmarshal(contents, &activity)
6767
if err != nil {
68-
fmt.Println("%s", err)
68+
fmt.Printf("%s\n", err)
6969
}
7070

7171
return activity

public_keys.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ func (g *Gitlab) ListKeys(id string) ([]*PublicKey, error) {
4040
return keys, err
4141
}
4242

43-
4443
func (g *Gitlab) UserKey(id string) (*PublicKey, error) {
4544
url := g.ResourceUrl(user_key, map[string]string{":id": id})
4645
var key *PublicKey

users.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
)
77

88
const (
9-
users_url = "/users?page=:page&per_page=:per_page" // Get users list
10-
user_url = "/users/:id" // Get a single user.
11-
current_user_url = "/user" // Get current user
9+
users_url = "/users?page=:page&per_page=:per_page" // Get users list
10+
user_url = "/users/:id" // Get a single user.
11+
current_user_url = "/user" // Get current user
1212
)
1313

1414
type User struct {

0 commit comments

Comments
 (0)