Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

fix '|&' pipe on travis osx vm #156

Merged
merged 2 commits into from
Jan 25, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
script:
- go build -v
- go vet $(go list ./... | grep -v vendor)
- test -z "$(gofmt -s -l . |& grep -v vendor | tee /dev/stderr)"
- test -z "$(gofmt -s -l . 2>&1 | grep -v vendor | tee /dev/stderr)"
- go test $(go list ./... | grep -v vendor)
- go build ./hack/licenseok
- find . -path ./vendor -prune -o -type f -name "*.go" -printf '%P\n' | xargs ./licenseok
Expand Down
4 changes: 2 additions & 2 deletions status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ func TestStatusFormatVersion(t *testing.T) {

tests := map[gps.Version]string{
nil: "",
gps.NewBranch("master"): "branch master",
gps.NewVersion("1.0.0"): "1.0.0",
gps.NewBranch("master"): "branch master",
gps.NewVersion("1.0.0"): "1.0.0",
gps.Revision("flooboofoobooo"): "flooboo",
}
for version, expected := range tests {
Expand Down