c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build.sh: pass -tags ooni to build (#112)

Browse Source 
See https://github.com/ooni/probe-engine/pull/333

Closes https://github.com/ooni/probe-engine/issues/267
This commit is contained in:
Simone Basso 2020-02-18 09:53:38 +01:00 committed by GitHub
parent 4a9034d907
commit c38c01f974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -1,7 +1,7 @@
#!/bin/sh #!/bin/sh
set -e set -e
buildtags="" buildtags="-tags ooni"
ldflags="-s -w" ldflags="-s -w"
if [ "$1" = "bindata" ]; then if [ "$1" = "bindata" ]; then
@ -76,7 +76,7 @@ elif [ "$1" = "_travis-linux" ]; then
# See: https://travis-ci.org/ooni/probe-cli/builds/619631256#L962 # See: https://travis-ci.org/ooni/probe-cli/builds/619631256#L962
$0 __docker go get -v golang.org/x/tools/cmd/cover $0 __docker go get -v golang.org/x/tools/cmd/cover
$0 __docker go get -v github.com/mattn/goveralls $0 __docker go get -v github.com/mattn/goveralls
$0 __docker go test -v -coverprofile=coverage.cov -coverpkg=./... ./... $0 __docker go test $buildtags -v -coverprofile=coverage.cov -coverpkg=./... ./...
$0 __docker /oonibuild/testdata/gotmp/path/bin/goveralls \ $0 __docker /oonibuild/testdata/gotmp/path/bin/goveralls \
-coverprofile=coverage.cov -service=travis-ci -coverprofile=coverage.cov -service=travis-ci

2
go.mod
View File

@ -11,7 +11,7 @@ require (
github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea github.com/getsentry/raven-go v0.0.0-20190419175539-919484f041ea
github.com/mattn/go-colorable v0.1.4 github.com/mattn/go-colorable v0.1.4
github.com/mattn/go-isatty v0.0.12 // indirect github.com/mattn/go-isatty v0.0.12 // indirect
github.com/ooni/probe-engine v0.6.0 github.com/ooni/probe-engine v0.6.1-0.20200218083423-582fca34e7c5
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/rubenv/sql-migrate v0.0.0-20200210110325-c8d4be6f9bb7 github.com/rubenv/sql-migrate v0.0.0-20200210110325-c8d4be6f9bb7
gopkg.in/AlecAivazis/survey.v1 v1.8.7 gopkg.in/AlecAivazis/survey.v1 v1.8.7

4
go.sum
View File

@ -324,8 +324,8 @@ github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
github.com/ooni/netx v0.0.0-20200113102411-24ca17149d15 h1:IKvGfOA18bM66tZdy9Thnw2ea6bWRnyefkN4eJEvLVQ= github.com/ooni/netx v0.0.0-20200113102411-24ca17149d15 h1:IKvGfOA18bM66tZdy9Thnw2ea6bWRnyefkN4eJEvLVQ=
github.com/ooni/netx v0.0.0-20200113102411-24ca17149d15/go.mod h1:vTJ7nYH2j51lX8yvhdLaHscvwz1GvWoiB26jYKEmqyA= github.com/ooni/netx v0.0.0-20200113102411-24ca17149d15/go.mod h1:vTJ7nYH2j51lX8yvhdLaHscvwz1GvWoiB26jYKEmqyA=
github.com/ooni/probe-engine v0.6.0 h1:4oZVncC34zBntf4YIBPJnAUvWoQi8y8h5G2ak7Ej9XY= github.com/ooni/probe-engine v0.6.1-0.20200218083423-582fca34e7c5 h1:nnrwZI8Yt02ynTM7eeJSijM1/XLsuxMNWZoMV6y0RuA=
github.com/ooni/probe-engine v0.6.0/go.mod h1:d2GL1fBskZJ5tRVqd17mbUokGp4JrrGtH5V59Q+GwYM= github.com/ooni/probe-engine v0.6.1-0.20200218083423-582fca34e7c5/go.mod h1:d2GL1fBskZJ5tRVqd17mbUokGp4JrrGtH5V59Q+GwYM=
github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc= github.com/openconfig/gnmi v0.0.0-20190823184014-89b2bf29312c/go.mod h1:t+O9It+LKzfOAhKTT5O0ehDix+MTqbtT0T9t+7zzOvc=
github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw= github.com/openconfig/reference v0.0.0-20190727015836-8dfd928c9696/go.mod h1:ym2A+zigScwkSEb/cVQB0/ZMpU3rqiH6X7WRRsxgOGw=
github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug= github.com/oschwald/geoip2-golang v1.4.0 h1:5RlrjCgRyIGDz/mBmPfnAF4h8k0IAcRv9PvrpOfz+Ug=