diff --git a/glide.lock b/glide.lock index f0ae3752..7a46cd3b 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: 2ff7c989fb0fde1375999fded74ae44e10be513a21416571f026390b679924e4 -updated: 2017-04-11T10:15:39.09271141-03:00 +hash: 7cc97c518c04beac5926bfef5fafc2c291d1c8eff945390edb5e71fecbf461f2 +updated: 2017-04-11T11:01:58.383683464-03:00 imports: - name: github.com/bradfitz/slice version: d9036e2120b5ddfa53f3ebccd618c4af275f47da @@ -24,7 +24,7 @@ imports: subpackages: - v2 - name: github.com/percona/pmgo - version: 9fce66aa289ba956854ea42a8615128982b5a85e + version: 9566dc76df319b856a12f24a3b6852a0c6463eff subpackages: - pmgomock - name: github.com/pkg/errors diff --git a/glide.yaml b/glide.yaml index 7332ec18..c4ef7088 100644 --- a/glide.yaml +++ b/glide.yaml @@ -5,19 +5,15 @@ import: - package: github.com/howeyc/gopass - package: github.com/kr/pretty - package: github.com/montanaflynn/stats - version: ^0.2.0 - package: github.com/pborman/getopt - package: github.com/percona/pmgo + version: ^0.4 - package: github.com/pkg/errors - version: ^0.8.0 - package: github.com/satori/go.uuid - version: ^1.1.0 - package: github.com/shirou/gopsutil - version: ^2.17.1 subpackages: - process - package: github.com/sirupsen/logrus - version: ^0.11.2 - package: gopkg.in/mgo.v2 subpackages: - bson diff --git a/src/go/Makefile b/src/go/Makefile index d5ea44d7..9722b52b 100644 --- a/src/go/Makefile +++ b/src/go/Makefile @@ -14,19 +14,19 @@ LDFLAGS="-X main.Version=${VERSION} -X main.Build=${BUILD} -X main.GoVersion=${G linux-amd64: @echo "Building linux/amd64 binaries in ${BIN_DIR}" - @cd ${TOP_DIR} && glide install -v + @cd ${TOP_DIR} && glide update -v @$(foreach pkg,$(pkgs),rm -f ${BIN_DIR}/$(pkg) 2> /dev/null;) @$(foreach pkg,$(pkgs),GOOS=linux GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/$(pkg) ./$(pkg);) linux-386: @echo "Building linux/386 binaries in ${BIN_DIR}" - @cd ${TOP_DIR} && glide install -v + @cd ${TOP_DIR} && glide update -v @$(foreach pkg,$(pkgs),rm -f ${BIN_DIR}/$(pkg) 2> /dev/null;) @$(foreach pkg,$(pkgs),GOOS=linux GOARCH=386 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/$(pkg) ./$(pkg);) darwin-amd64: @echo "Building darwin/amd64 binaries in ${BIN_DIR}" - @cd ${TOP_DIR} && glide install -v + @cd ${TOP_DIR} && glide update -v @$(foreach pkg,$(pkgs),rm -f ${BIN_DIR}/$(pkg) 2> /dev/null;) @$(foreach pkg,$(pkgs),GOOS=darwin GOARCH=amd64 go build -ldflags ${LDFLAGS} -o ${BIN_DIR}/$(pkg) ./$(pkg);)