deps: latest upper.io/db and pin probe-engine #116
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
We're specifically pinning a commit of probe-engine that is using MK v0.10.11, so that we address the following issues: 1. we use db-ip.com for the country database as opposed to using the increasingly stale MaxMind database (see ooni/probe-engine#334) 2. we're using an implementation of WhatsApp that does not suffer from the super-old CIDR bug (see ooni/probe-engine#341) 3. we're not linking to libcurl anymore on Windows and Linux, thanks to this new version of MK where we can optionally disable libcurl; we are still linking to libcurl on macOS, but that has no impact on the binary size since on macOS libcurl is part of the system This should be enough, from my side to bless a new release of the probe-cli (see ooni/probe#1028).
bassosimone
commented
Feb 26, 2020
| @@ -1,2 +1,4 @@ | |||
| /dist | |||
| /ooniprobe | |||
| /ooniprobe.exe | |||
There was a problem hiding this comment.
Send less useless context to Docker daemon
| @@ -1,2 +1,2 @@ | |||
| FROM openobservatory/mk-alpine:latest | |||
| FROM openobservatory/mk-alpine:20200226 | |||
There was a problem hiding this comment.
Reproducible builds
| @@ -22,7 +22,7 @@ fi | |||
| if [ "$1" = "windows" ]; then | |||
| set -x | |||
| CC=x86_64-w64-mingw32-gcc CXX=x86_64-w64-mingw32-g++ \ | |||
| CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \ | |||
| CGO_LDFLAGS_ALLOW='-fstack-.*' CGO_ENABLED=1 GOOS=windows GOARCH=amd64 \ | |||
There was a problem hiding this comment.
Now, sadly, we need to white list this flag to correctly link on Windows
| @@ -48,7 +48,7 @@ elif [ "$1" = "release" ]; then | |||
| -C ./dist/macos/amd64 ooniprobe | |||
| shasum -a 256 ooniprobe_${v}_darwin_amd64.tar.gz >> ooniprobe_checksums.txt | |||
| $0 windows | |||
| tar -czf ooniprobe_${v}_windows_amd64.tar.gz ./dist/windows/amd64 \ | |||
| tar -czf ooniprobe_${v}_windows_amd64.tar.gz LICENSE.md Readme.md \ | |||
There was a problem hiding this comment.
While there, fix the distribution generation on Windows, which was broken
ainghazal
pushed a commit
to ainghazal/probe-cli
that referenced
this pull request
Mar 8, 2022
We're specifically pinning a commit of probe-engine that is using MK v0.10.11, so that we address the following issues: 1. we use db-ip.com for the country database as opposed to using the increasingly stale MaxMind database (see ooni/probe-engine#334) 2. we're using an implementation of WhatsApp that does not suffer from the super-old CIDR bug (see ooni/probe-engine#341) 3. we're not linking to libcurl anymore on Windows and Linux, thanks to this new version of MK where we can optionally disable libcurl; we are still linking to libcurl on macOS, but that has no impact on the binary size since on macOS libcurl is part of the system This should be enough, from my side to bless a new release of the probe-cli (see ooni/probe#1028).
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.
We're specifically pinning a commit of probe-engine that is using
MK v0.10.11, so that we address the following issues:
we use db-ip.com for the country database as opposed to using
the increasingly stale MaxMind database (see probe-assets: use db-ip.com IP for country DB probe-engine#334)
we're using an implementation of WhatsApp that does not suffer
from the super-old CIDR bug (see WhatsApp false positives due to obsolete CIDR probe-engine#341)
we're not linking to libcurl anymore on Windows and Linux, thanks to
this new version of MK where we can optionally disable libcurl; we are
still linking to libcurl on macOS, but that has no impact on the binary
size since on macOS libcurl is part of the system
This should be enough, from my side to bless a new release of the
probe-cli (see ooni/probe#1028).