travis.yml: update to Go 1.12

Also fix the tests on tip, which broke because of the new Frames API
for error objects.

Author: kevinburke

.travis.yml

@@ -14,24 +14,26 @@ jobs:
       env:
         - DEPTESTBYPASS501=1
         - TZ=UTC
+        - GOCACHE=/home/travis/var/cache
       os: linux
-      go: 1.11.x
+      go: 1.12.x
       script:
         - make validate test
         - ./hack/coverage.bash
       after_success:
         - codeclimate-test-reporter < coverage.txt
     # YAML alias, for settings shared across the simpler builds
     - &simple-test
-      go: 1.10.x
+      go: 1.11.x
       stage: test
       go_import_path: github.com/golang/dep
       install:
         - ssh-keyscan -t $TRAVIS_SSH_KEY_TYPES -H bitbucket.org >> ~/.ssh/known_hosts
       env:
         - DEPTESTBYPASS501=1
         - TZ=UTC
-      script: make test
+      script:
+        - make test
     - <<: *simple-test
       go: 1.9.x
     - <<: *simple-test
@@ -46,7 +48,7 @@ jobs:
 
     - <<: *simple-test
       os: osx
-      go: 1.11.x
+      go: 1.12.x
       install:
         # brew takes horribly long to update itself despite the above caching
         # attempt; only bzr install if it's not on the $PATH
@@ -56,6 +58,7 @@ jobs:
         - HOMEBREW_NO_AUTO_UPDATE=1
         - DEPTESTBYPASS501=1
         - TZ=UTC
+        - GOCACHE=/Users/travis/var/cache
       script:
         # OSX as of El Capitan sets an exit trap that interacts poorly with how
         # travis seems to spawn these shells; if set -e is set, then it can cause
@@ -64,15 +67,16 @@ jobs:
         # Related: https://superuser.com/questions/1044130/why-am-i-having-how-can-i-fix-this-error-shell-session-update-command-not-f
         - trap EXIT
         - make test
-    - go: 1.11.x
+    - go: 1.12.x
       # Run on OS X so that we get a CGO-enabled binary for this OS; see
       # https://github.com/golang/dep/issues/1838 for more details.
       os: osx
       stage: deploy
       go_import_path: github.com/golang/dep
       install:
         - ssh-keyscan -t $TRAVIS_SSH_KEY_TYPES -H bitbucket.org >> ~/.ssh/known_hosts
-      script: skip
+      script:
+        - skip
       before_deploy:
         - ./hack/build-all.bash
       deploy:

Gopkg.lock

@@ -141,7 +141,7 @@ func ListPackages(fileRoot, importRoot string) (PackageTree, error) {
 		if err != nil {
 			switch err.(type) {
 			case gscan.ErrorList, *gscan.Error, *build.NoGoError, *ConflictingImportComments:
-				// Assorted cases in which we've encounter malformed or
+				// Assorted cases in which we've encountered malformed or
 				// nonexistent Go source code.
 				ptree.Packages[ip] = PackageOrErr{
 					Err: err,

gps/pkgtree/pkgtree.go

@@ -21,6 +21,7 @@ import (
 	"github.com/golang/dep/gps/paths"
 	"github.com/golang/dep/internal/fs"
 	_ "github.com/golang/dep/internal/test" // DO NOT REMOVE, allows go test ./... -update to work
+	"github.com/google/go-cmp/cmp"
 )
 
 // PackageTree.ToReachMap() uses an easily separable algorithm, wmToReach(),
@@ -546,11 +547,13 @@ func TestWorkmapToReach(t *testing.T) {
 			}
 
 			rm, em := wmToReach(fix.workmap, fix.backprop)
-			if !reflect.DeepEqual(rm, fix.rm) {
+			if diff := cmp.Diff(rm, fix.rm); diff != "" {
 				//t.Error(pretty.Sprintf("wmToReach(%q): Did not get expected reach map:\n\t(GOT): %s\n\t(WNT): %s", name, rm, fix.rm))
 				t.Errorf("Did not get expected reach map:\n\t(GOT): %s\n\t(WNT): %s", rm, fix.rm)
 			}
-			if !reflect.DeepEqual(em, fix.em) {
+			if diff := cmp.Diff(em, fix.em, cmp.Comparer(func(x error, y error) bool {
+				return x.Error() == y.Error()
+			})); diff != "" {
 				//t.Error(pretty.Sprintf("wmToReach(%q): Did not get expected error map:\n\t(GOT): %# v\n\t(WNT): %# v", name, em, fix.em))
 				t.Errorf("Did not get expected error map:\n\t(GOT): %v\n\t(WNT): %v", em, fix.em)
 			}