From 86c9638572f3cf7839e087d1ade3db69c33cec6b Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Mon, 27 Mar 2017 18:16:39 -0400 Subject: [PATCH 1/4] dist.sh: already uses set "-e", remove "|| exit 1" --- dist.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dist.sh b/dist.sh index 3bc45ba..27a31a0 100755 --- a/dist.sh +++ b/dist.sh @@ -1,7 +1,6 @@ #!/bin/bash - # build binary distributions for linux/amd64 and darwin/amd64 -set -e +set -e DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" echo "working dir $DIR" @@ -16,7 +15,7 @@ version=$(cat $DIR/version.go | grep "const VERSION" | awk '{print $NF}' | sed ' goversion=$(go version | awk '{print $3}') echo "... running tests" -./test.sh || exit 1 +./test.sh for os in windows linux darwin; do echo "... building v$version for $os/$arch" From 2024dc34ac3d0bc5b808bc0311978f865db77caf Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Mon, 27 Mar 2017 19:13:05 -0400 Subject: [PATCH 2/4] dist.sh: run gpm with GOPATH=$DIR/.godeps so gpm is not affected if module exists in user's GOPATH already --- dist.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dist.sh b/dist.sh index 27a31a0..99b13c6 100755 --- a/dist.sh +++ b/dist.sh @@ -7,7 +7,7 @@ echo "working dir $DIR" mkdir -p $DIR/dist mkdir -p $DIR/.godeps export GOPATH=$DIR/.godeps:$GOPATH -gpm install +GOPATH=$DIR/.godeps gpm install os=$(go env GOOS) arch=$(go env GOARCH) From a2eeec2b7ad1d99217e24d37caa0b5e4c9b39d2a Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Mon, 27 Mar 2017 19:14:53 -0400 Subject: [PATCH 3/4] Godeps: remove redundant dep, add missing golang.org/x/oauth2/google is same repo as golang.org/x/oauth2 - this sometimes confused gpm/git cloud.google.com/go/compute/metadata is a missing dependency of golang.org/x/oauth2 --- Godeps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Godeps b/Godeps index 610aea5..45633c0 100644 --- a/Godeps +++ b/Godeps @@ -5,5 +5,5 @@ github.com/mreiferson/go-options 33795234b6f327f1be2d78a541893012362a4e0 github.com/bmizerany/assert e17e99893cb6509f428e1728281c2ad60a6b31e3 gopkg.in/fsnotify.v1 v1.2.0 golang.org/x/oauth2 04e1573abc896e70388bd387a69753c378d46466 -golang.org/x/oauth2/google 04e1573abc896e70388bd387a69753c378d46466 google.golang.org/api/admin/directory/v1 a5c3e2a4792aff40e59840d9ecdff0542a202a80 +cloud.google.com/go/compute/metadata v0.7.0 From 9167c8ace8c429ab66d330a3fb8314277da729bf Mon Sep 17 00:00:00 2001 From: Pierce Lopez Date: Mon, 27 Mar 2017 19:40:12 -0400 Subject: [PATCH 4/4] travis: update go versions, gpm version --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 763aaa3..30f4526 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ language: go go: - - 1.5.4 - - 1.6.3 + - 1.6.4 + - 1.7.5 + - 1.8 script: - - curl -s https://raw.githubusercontent.com/pote/gpm/v1.3.2/bin/gpm > gpm + - curl -s https://raw.githubusercontent.com/pote/gpm/v1.4.0/bin/gpm > gpm - chmod +x gpm - ./gpm install - ./test.sh sudo: false notifications: email: false -