Merge pull request #68 from craig-willis/NDS-354

Added godeps support
nds-org · Jul 1, 2016 · 8bb67c8 · 8bb67c8
2 parents 458d754 + 75238f8
commit 8bb67c8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/apictl/Godeps/Godeps.json b/apictl/Godeps/Godeps.json
diff --git a/apictl/build.sh b/apictl/build.sh
@@ -15,6 +15,7 @@ if [ "$1" = "build" ] || [ -z $1 ]; then
 	echo ")" >> $VERSIONFILE
 	rm -f build/bin/$APP-linux-amd64 build/$APP-darwin-amd64
 	mkdir -p build/bin build/bin build/pkg
+	go get
 	echo Building Darwin
 	GOOS=darwin GOARCH=amd64 go build -o build/bin/$APP-darwin-amd64
 	echo Building Linux

diff --git a/apiserver/Godeps/Godeps.json b/apiserver/Godeps/Godeps.json
diff --git a/apiserver/build.sh b/apiserver/build.sh
@@ -16,7 +16,8 @@ if [ "$1" = "build" ] || [ -z $1 ]; then
 	rm -f build/bin/$APP-linux-amd64 build/$APP-darwin-amd64
 	mkdir -p build/bin build/bin build/pkg
 	echo Building Darwin
-	GOOS=darwin GOARCH=amd64 go build -o build/bin/$APP-darwin-amd64
+	godep restore
+	GOOS=darwin GOARCH=amd64 godep go build -o build/bin/$APP-darwin-amd64
 	echo Building Linux
 	docker run --rm -it -v `pwd`:/go/src/github.com/ndslabs/apiserver -v `pwd`/build/bin:/go/bin -v `pwd`/build/pkg:/go/pkg -v `pwd`/gobuild.sh:/gobuild.sh golang:1.5  /gobuild.sh