Skip to content

Commit

Permalink
fix build scripts to work with Godeps
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinmm80 committed Jun 10, 2015
1 parent dbdb53a commit ee15194
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Godeps/_workspace/src/github.com/jstemmer/
test.rb
test.out
junit.xml
Expand Down
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ buildcmd='GOX_OS="darwin linux windows" GOX_ARCH="amd64" gox -verbose -output "p
docker run --rm \
-v "$(pwd)":"${projectpath}" \
-w "${projectpath}" \
-e "GOPATH=/goroot/src/github.com/conjurinc/${app}/Godeps/_workspace:$GOPATH" \
-e "GOPATH=/goroot/src/github.com/conjurinc/${app}/Godeps/_workspace:/goroot" \
summon/build \
bash -c "${buildcmd}"
2 changes: 1 addition & 1 deletion cli.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func RunCLI() error {
app := cli.NewApp()
app.Name = "summon"
app.Usage = "Parse secrets.yml and export environment variables"
app.Version = "0.1.0"
app.Version = "0.1.2"
app.Writer = CLIWriter
app.Flags = command.Flags
app.Action = command.Action
Expand Down
7 changes: 5 additions & 2 deletions test.sh
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
#!/bin/bash

app="summon"

docker build -t summon/build .

projectpath="/goroot/src/github.com/conjurinc/summon"

docker run --rm \
-v "$(pwd)":"${projectpath}" \
-w "${projectpath}" \
-e "GOPATH=/goroot/src/github.com/conjurinc/${app}/Godeps/_workspace:/goroot" \
summon/build \
bash -ceo pipefail "xargs -L1 go get <Godeps && \
go build ./... && \
bash -ceo pipefail "export PATH=/goroot/src/github.com/conjurinc/${app}/Godeps/_workspace/bin:\$PATH && \
go get -u github.com/jstemmer/go-junit-report && \
go test -v ./... | tee test.tmp \
&& cat test.tmp | go-junit-report > junit.xml && rm test.tmp"

0 comments on commit ee15194

Please sign in to comment.