diff --git a/.travis.yml b/.travis.yml index 158e4d0..1b86ea9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ go: install: - make install-dev-deps - dep ensure -- make update-mk-libs +- make download-mk-libs-macos script: - make test-internal -- make build \ No newline at end of file +- make build diff --git a/Gopkg.lock b/Gopkg.lock index 979b6c9..2d6eb69 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -68,7 +68,7 @@ branch = "master" name = "github.com/measurement-kit/go-measurement-kit" packages = ["."] - revision = "b44943bb7da37f768d30315a2227dac86feac546" + revision = "33cbd62d4a73b68af069f70a797c2250332c059a" [[projects]] branch = "master" diff --git a/Makefile b/Makefile index 9b3dd13..25e9fa1 100644 --- a/Makefile +++ b/Makefile @@ -14,10 +14,13 @@ build-windows: @echo "Building dist/ooni.exe" CC=x86_64-w64-mingw32-gcc GOOS=windows GOARCH=amd64 CGO_ENABLED=1 go build -o dist/ooni.exe -x cmd/ooni/main.go -update-mk-libs: +download-mk-libs: @echo "updating mk-libs" - @cd vendor/github.com/measurement-kit/go-measurement-kit && curl -L -o master.zip https://github.com/measurement-kit/golang-prebuilt/archive/master.zip && unzip master.zip && mv golang-prebuilt-master libs && rm master.zip # This is a hack to workaround: https://github.com/golang/dep/issues/1240 -.PHONY: update-mk-libs + @cd vendor/github.com/measurement-kit/go-measurement-kit && ./download-libs.sh +download-mk-libs-macos: + @echo "updating mk-libs" + @cd vendor/github.com/measurement-kit/go-measurement-kit && ./download-libs.sh macos +.PHONY: update-mk-libs-macos bindata: @$(GO) run vendor/github.com/shuLhan/go-bindata/go-bindata/*.go \