Require and use measurement-kit v0.10.11 #374
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bassosimone
commented
Feb 26, 2020
| @@ -5,4 +5,4 @@ jobs: | |||
| runs-on: ubuntu-latest | |||
| steps: | |||
| - uses: actions/checkout@v2 | |||
| - run: docker run -v`pwd`:/mk -w/mk openobservatory/mk-alpine:20200225 /mk/.github/workflows/mk.sh | |||
| - run: docker run -v`pwd`:/mk -w/mk openobservatory/mk-alpine:20200226 /mk/.github/workflows/mk.sh | |||
There was a problem hiding this comment.
Docker image with MK v0.10.11
| @@ -23,19 +23,17 @@ import ( | |||
| // #cgo windows,amd64 CFLAGS: -I/usr/local/opt/mingw-w64-measurement-kit/include/ | |||
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-measurement-kit/lib/libmeasurement_kit.a | |||
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-libmaxminddb/lib/libmaxminddb.a | |||
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-curl/lib/libcurl.a | |||
There was a problem hiding this comment.
MK v0.10.11 doesn't depend anymore on curl on Windows
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-libevent/lib/libevent_openssl.a | ||
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-libressl/lib/libssl.a | ||
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-libressl/lib/libcrypto.a | ||
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-libevent/lib/libevent_core.a | ||
| // #cgo windows,amd64 LDFLAGS: /usr/local/opt/mingw-w64-libevent/lib/libevent_extra.a | ||
| // #cgo windows,amd64 LDFLAGS: -lws2_32 | ||
| // #cgo windows,amd64 LDFLAGS: -fstack-protector-strong |
There was a problem hiding this comment.
This is inherited by LibreSSL, which forces this flag. It's super annoying because this flag is not allowed by CGO by default and, to be able to use it, we need to export CGO_LDFLAGS_ALLOW='-fstack-.*'
| // | ||
| // #cgo linux,amd64,ooni LDFLAGS: -static | ||
| // #cgo linux,amd64,ooni LDFLAGS: /usr/local/lib/libmeasurement_kit.a | ||
| // #cgo linux,amd64,ooni LDFLAGS: /usr/lib/libmaxminddb.a | ||
| // #cgo linux,amd64,ooni LDFLAGS: /usr/lib/libcurl.a | ||
| // #cgo linux,amd64,ooni LDFLAGS: /usr/lib/libnghttp2.a |
There was a problem hiding this comment.
Also on Linux (the OONI flavour), we don't depend on libcurl and its dependencies anymore.
| @@ -46,7 +44,7 @@ import ( | |||
| // | |||
| // #cgo linux,!ooni LDFLAGS: -lmeasurement_kit | |||
| // | |||
| // #if MK_VERSION_NUMERIC != 0x00000000010000101LL | |||
| // #if MK_VERSION_NUMERIC != 0x00000000010000111LL | |||
There was a problem hiding this comment.
Here we're saying we want MK v0.10.11
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Also part of #334