Skip to content

Commit

Permalink
Merge branch 'master' of github.com:wagoodman/dive
Browse files Browse the repository at this point in the history
  • Loading branch information
wagoodman committed Nov 30, 2018
2 parents 816e715 + 1c2df29 commit 1baa942
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 3 deletions.
31 changes: 31 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
language: go

go:
- '1.8'
- '1.9'
- '1.10'
- '1.11'
- 'master'

# Skip the install step. Don't `go get` dependencies. Only build with the
# code in vendor/
install: true

matrix:
# It's ok if our code fails on unstable development versions of Go.
allow_failures:
- go: master
# Don't wait for tip tests to finish. Mark the test run green if the
# tests pass on the stable versions of Go.
fast_finish: true

notifications:
email: false

before_script:
- go get -t ./...

# Note: scripts always run to completion
script:
- make validate
- make test
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ run-large: build
build:
go build -o build/$(BIN)

release: test
release: test validate
./.scripts/tag.sh
goreleaser --rm-dist

Expand All @@ -21,6 +21,10 @@ install:
test: build
go test -cover -v ./...

validate:
@! gofmt -s -d -l . 2>&1 | grep -vE '^\.git/'
go vet ./...

lint: build
golint -set_exit_status $$(go list ./...)

Expand All @@ -29,4 +33,4 @@ clean:
rm -rf vendor
go clean

.PHONY: build install test lint clean release
.PHONY: build install test lint clean release validate
2 changes: 1 addition & 1 deletion ui/ui.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func layout(g *gocui.Gui) error {
logrus.Errorf("invalid config value: 'filetree.pane-width' should be 0 < value < 1, given '%v'", fileTreeSplitRatio)
fileTreeSplitRatio = 0.5
}
splitCols := int(float64(maxX) * (1.0-fileTreeSplitRatio))
splitCols := int(float64(maxX) * (1.0 - fileTreeSplitRatio))
debugWidth := 0
if debug {
debugWidth = maxX / 4
Expand Down

0 comments on commit 1baa942

Please sign in to comment.