diff --git a/.travis.yml b/.travis.yml index 1d18d08..1723120 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,22 +1,10 @@ sudo: false language: go go: - - "1.10.x" - - "1.x" - - "tip" -matrix: - allow_failures: - - go: tip - fast_finish: true -before_install: - - mkdir -p $HOME/gopath/src/sourcegraph.com/sourcegraph - - mv $TRAVIS_BUILD_DIR $HOME/gopath/src/sourcegraph.com/sourcegraph/go-diff - - export TRAVIS_BUILD_DIR=$HOME/gopath/src/sourcegraph.com/sourcegraph/go-diff - - cd $TRAVIS_BUILD_DIR -install: - - # Do nothing. This is needed to prevent default install action "go get -t -v ./..." from happening here (we want it to happen inside script step). + - "1.12.x" script: - GO111MODULE=on go get -t -v ./... - diff -u <(echo -n) <(gofmt -d -s .) - - GO111MODULE=on go tool vet . - - GO111MODULE=on go test -v -race ./... + - GO111MODULE=on go test -v -race -coverprofile=coverage.txt -covermode=atomic ./... +after_success: + - bash <(curl -s https://codecov.io/bash) \ No newline at end of file diff --git a/cmd/go-diff/go-diff.go b/cmd/go-diff/go-diff.go index aa52e44..5807060 100644 --- a/cmd/go-diff/go-diff.go +++ b/cmd/go-diff/go-diff.go @@ -7,7 +7,7 @@ import ( "log" "os" - "sourcegraph.com/sourcegraph/go-diff/diff" + "github.com/sourcegraph/go-diff/diff" ) // A diagnostic program to aid in debugging diff parsing or printing diff --git a/diff/doc.go b/diff/doc.go index 01f06dd..12fe96a 100644 --- a/diff/doc.go +++ b/diff/doc.go @@ -1,2 +1,2 @@ // Package diff provides a parser for unified diffs. -package diff // import "sourcegraph.com/sourcegraph/go-diff/diff" +package diff diff --git a/diff/testdata/empty_multi.diff b/diff/testdata/empty_multi.diff index b85b802..09b4f9c 100644 --- a/diff/testdata/empty_multi.diff +++ b/diff/testdata/empty_multi.diff @@ -1,11 +1,11 @@ -diff --git Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty.diff Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty.diff +diff --git Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty.diff Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty.diff new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 -diff --git Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty_new.diff Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty_new.diff +diff --git Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty_new.diff Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty_new.diff new file mode 100644 index 0000000000000000000000000000000000000000..527e2e70f57b02e709f53e3ac2b7f59e2b5a46bc --- /dev/null -+++ Godeps/_workspace/src/sourcegraph.com/sourcegraph/go-diff/diff/testdata/empty_new.diff ++++ Godeps/_workspace/src/github.com/sourcegraph/go-diff/diff/testdata/empty_new.diff @@ -0,0 +1,2 @@ +@@ -1,1 +0,0 @@ +-b diff --git a/go.mod b/go.mod index 65f0dc3..1b52c27 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module sourcegraph.com/sourcegraph/go-diff +module github.com/sourcegraph/go-diff require ( github.com/gogo/protobuf v1.1.1