meutel/oauth2_proxy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #355 from ploxiln/dist_updates

Browse Source 
dist.sh and Godeps updates
This commit is contained in:
Jehiah Czebotar 2017-03-27 20:16:44 -04:00 committed by GitHub
commit 951b5f325b
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -1,13 +1,13 @@
language: go language: go
go: go:
- 1.5.4 - 1.6.4
- 1.6.3 - 1.7.5
- 1.8
script: 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 - chmod +x gpm
- ./gpm install - ./gpm install
- ./test.sh - ./test.sh
sudo: false sudo: false
notifications: notifications:
email: false email: false

2
Godeps
View File

@ -5,5 +5,5 @@ github.com/mreiferson/go-options 33795234b6f327f1be2d78a541893012362a4e0
github.com/bmizerany/assert e17e99893cb6509f428e1728281c2ad60a6b31e3 github.com/bmizerany/assert e17e99893cb6509f428e1728281c2ad60a6b31e3
gopkg.in/fsnotify.v1 v1.2.0 gopkg.in/fsnotify.v1 v1.2.0
golang.org/x/oauth2 04e1573abc896e70388bd387a69753c378d46466 golang.org/x/oauth2 04e1573abc896e70388bd387a69753c378d46466
golang.org/x/oauth2/google 04e1573abc896e70388bd387a69753c378d46466
google.golang.org/api/admin/directory/v1 a5c3e2a4792aff40e59840d9ecdff0542a202a80 google.golang.org/api/admin/directory/v1 a5c3e2a4792aff40e59840d9ecdff0542a202a80
cloud.google.com/go/compute/metadata v0.7.0

7
dist.sh
View File

@ -1,14 +1,13 @@
#!/bin/bash #!/bin/bash
# build binary distributions for linux/amd64 and darwin/amd64 # build binary distributions for linux/amd64 and darwin/amd64
set -e set -e
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
echo "working dir $DIR" echo "working dir $DIR"
mkdir -p $DIR/dist mkdir -p $DIR/dist
mkdir -p $DIR/.godeps mkdir -p $DIR/.godeps
export GOPATH=$DIR/.godeps:$GOPATH export GOPATH=$DIR/.godeps:$GOPATH
gpm install GOPATH=$DIR/.godeps gpm install
os=$(go env GOOS) os=$(go env GOOS)
arch=$(go env GOARCH) arch=$(go env GOARCH)
@ -16,7 +15,7 @@ version=$(cat $DIR/version.go | grep "const VERSION" | awk '{print $NF}' | sed '
goversion=$(go version | awk '{print $3}') goversion=$(go version | awk '{print $3}')
echo "... running tests" echo "... running tests"
./test.sh || exit 1 ./test.sh
for os in windows linux darwin; do for os in windows linux darwin; do
echo "... building v$version for $os/$arch" echo "... building v$version for $os/$arch"