git.iko.soy/typeable/oauth2-proxy
on master help sign in
Merge pull request #355 from ploxiln/dist_updates

dist.sh and Godeps updates

commit951b5f325b30c330ee0ae61f078b7d42b40d1041 authorJehiah Czebotar <jehiah@gmail.com> dateMon 27 Mar 2017, 20:16 (10 years ago) parent7d920c99167c8a
3 files changed+8−9
compare with master
unifiedsplit
.travis.yml+4−4 Godeps+1−1 dist.sh+3−4
.travis.yml+4−4
@@ -1,13 +1,13 @@
11language: go
22go:
3− - 1.5.4
4− - 1.6.3
3+ - 1.6.4
4+ - 1.7.5
5+ - 1.8
56script:
6− - curl -s https://raw.githubusercontent.com/pote/gpm/v1.3.2/bin/gpm > gpm
7+ - curl -s https://raw.githubusercontent.com/pote/gpm/v1.4.0/bin/gpm > gpm
78 - chmod +x gpm
89 - ./gpm install
910 - ./test.sh
1011sudo: false
1112notifications:
1213 email: false
13−
Godeps+1−1
@@ -5,5 +5,5 @@ github.com/mreiferson/go-options 33795234b6f327f1be2d78a541893012362a4e0
55github.com/bmizerany/assert e17e99893cb6509f428e1728281c2ad60a6b31e3
66gopkg.in/fsnotify.v1 v1.2.0
77golang.org/x/oauth2 04e1573abc896e70388bd387a69753c378d46466
8−golang.org/x/oauth2/google 04e1573abc896e70388bd387a69753c378d46466
98google.golang.org/api/admin/directory/v1 a5c3e2a4792aff40e59840d9ecdff0542a202a80
9+cloud.google.com/go/compute/metadata v0.7.0
dist.sh+3−4
@@ -1,14 +1,13 @@
11#!/bin/bash
2−
32# build binary distributions for linux/amd64 and darwin/amd64
4−set -e
3+set -e
54
65DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
76echo "working dir $DIR"
87mkdir -p $DIR/dist
98mkdir -p $DIR/.godeps
109export GOPATH=$DIR/.godeps:$GOPATH
11−gpm install
10+GOPATH=$DIR/.godeps gpm install
1211
1312os=$(go env GOOS)
1413arch=$(go env GOARCH)
@@ -16,7 +15,7 @@ version=$(cat $DIR/version.go | grep "const VERSION" | awk '{print $NF}' | sed '
1615goversion=$(go version | awk '{print $3}')
1716
1817echo "... running tests"
19−./test.sh || exit 1
18+./test.sh
2019
2120for os in windows linux darwin; do
2221 echo "... building v$version for $os/$arch"