Start preparing release 3.11.0 (#547)

* chore(ci): use go1.17.2 for all checks Part of ooni/probe#1815 * chore(mk): use go1.17.2 Part of ooni/probe#1815 * chore: update all dependencies Part of ooni/probe#1815 * chore: update the user-agent Part of ooni/probe#1815 * chore: update the version number Part of ooni/probe#1815 * chore: run go generate Part of ooni/probe#1815 * fix: update to ooni/probe-assets@v0.5.0 This overcomes ooni/probe#1836 in the CLI and, while there, let us also make maxminddb tests stricter. * fix(QA/Dockerfile): build using go1.17 See #547 (comment) * fix(codeql): always run for master Otherwise we see a warning that there is no CodeQL information available for the base branch and this is sub-optimal. Part of ooni/probe#1815
ooni · Oct 20, 2021 · a548889 · a548889
1 parent 8931a36
commit a548889
Show file tree

Hide file tree

Showing 53 changed files with 232 additions and 173 deletions.
diff --git a/.github/workflows/alltests.yml b/.github/workflows/alltests.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: go test -race -tags shaping ./...
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16.4"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./mk OONI_PSIPHON_TAGS="" ./MOBILE/android/oonimkall.aar
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -9,7 +9,7 @@ name: "CodeQL"
 
 on:
  push:
- branches: [ "release/**" ]
+ branches: [ "master", "release/**" ]
 
 jobs:
  analyze:

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -10,7 +10,7 @@ jobs:
  runs-on: ubuntu-20.04
  strategy:
  matrix:
- go: [ "1.17.1" ]
+ go: [ "1.17.2" ]
  steps:
  - uses: actions/setup-go@v1
  with:

diff --git a/.github/workflows/generate.yml b/.github/workflows/generate.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: go generate ./...
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16.4"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./mk OONI_PSIPHON_TAGS="" XCODE_VERSION=12.4 ./MOBILE/ios/oonimkall.framework.zip
diff --git a/.github/workflows/jafar.yml b/.github/workflows/jafar.yml
@@ -9,7 +9,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: go build -v ./internal/cmd/jafar
  - run: sudo ./testjafar.bash
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -10,7 +10,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16.4"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./mk OONI_PSIPHON_TAGS="" ./CLI/darwin/amd64/ooniprobe
  - run: ./E2E/ooniprobe.sh ./CLI/darwin/amd64/ooniprobe
diff --git a/.github/workflows/miniooni.yml b/.github/workflows/miniooni.yml
@@ -12,7 +12,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16.4"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./mk OONI_PSIPHON_TAGS="" ./CLI/miniooni
 

diff --git a/.github/workflows/netxlite.yml b/.github/workflows/netxlite.yml
@@ -10,7 +10,7 @@ jobs:
  runs-on: "${{ matrix.os }}"
  strategy:
  matrix:
- go: [ "1.17.1" ]
+ go: [ "1.17.2" ]
  os: [ "ubuntu-20.04", "windows-2019", "macos-10.15" ]
  steps:
  - uses: actions/setup-go@v1

diff --git a/.github/workflows/oohelperd.yml b/.github/workflows/oohelperd.yml
@@ -12,7 +12,7 @@ jobs:
  - uses: actions/checkout@v2
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16.4"
+ go-version: "1.17.2"
 
  - name: build oohelperd binary
  run: GOOS=linux GOARCH=amd64 go build -v ./internal/cmd/oohelperd

diff --git a/.github/workflows/qafbmessenger.yml b/.github/workflows/qafbmessenger.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./QA/rundocker.bash "fbmessenger"
diff --git a/.github/workflows/qahhfm.yml b/.github/workflows/qahhfm.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./QA/rundocker.bash "hhfm"
diff --git a/.github/workflows/qahirl.yml b/.github/workflows/qahirl.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./QA/rundocker.bash "hirl"
diff --git a/.github/workflows/qatelegram.yml b/.github/workflows/qatelegram.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./QA/rundocker.bash "telegram"
diff --git a/.github/workflows/qawebconnectivity.yml b/.github/workflows/qawebconnectivity.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./QA/rundocker.bash "webconnectivity"
diff --git a/.github/workflows/qawhatsapp.yml b/.github/workflows/qawhatsapp.yml
@@ -10,6 +10,6 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: ./QA/rundocker.bash "whatsapp"
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -10,7 +10,7 @@ jobs:
  steps:
  - uses: actions/setup-go@v1
  with:
- go-version: "1.16.4"
+ go-version: "1.17.2"
  - uses: actions/checkout@v2
  - run: sudo apt install mingw-w64
  - run: ./mk OONI_PSIPHON_TAGS="" MINGW_W64_VERSION="9.3-win32" ./CLI/windows/amd64/ooniprobe.exe

diff --git a/QA/Dockerfile b/QA/Dockerfile
@@ -1,2 +1,2 @@
-FROM golang:1.16-alpine
+FROM golang:1.17-alpine
 RUN apk add go git musl-dev iptables tmux bind-tools curl sudo python3
diff --git a/go.mod b/go.mod
@@ -3,50 +3,56 @@ module github.com/ooni/probe-cli/v3
 go 1.16
 
 require (
- filippo.io/age v1.0.0-rc.1
- git.torproject.org/pluggable-transports/goptlib.git v1.1.0
- git.torproject.org/pluggable-transports/snowflake.git v1.0.0
+ filippo.io/age v1.0.0
+ git.torproject.org/pluggable-transports/goptlib.git v1.2.0
+ git.torproject.org/pluggable-transports/snowflake.git v1.1.0
  github.com/alecthomas/kingpin v2.2.6+incompatible
- github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
+ github.com/alecthomas/units v0.0.0-20210927113745-59d0afb8317a // indirect
  github.com/apex/log v1.9.0
  github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
  github.com/creack/goselect v0.1.2 // indirect
- github.com/cretz/bine v0.1.0
+ github.com/cretz/bine v0.2.0
  github.com/dchest/siphash v1.2.2 // indirect
- github.com/fatih/color v1.10.0
+ github.com/fatih/color v1.13.0
+ github.com/fsnotify/fsnotify v1.5.1 // indirect
  github.com/google/go-cmp v0.5.5
- github.com/google/martian/v3 v3.1.0
+ github.com/google/martian/v3 v3.2.1
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
- github.com/google/uuid v1.2.0
+ github.com/google/uuid v1.3.0
  github.com/gorilla/websocket v1.4.2
  github.com/hexops/gotextdiff v1.0.3
- github.com/iancoleman/strcase v0.1.3
- github.com/lucas-clemente/quic-go v0.23.0
- github.com/mattn/go-colorable v0.1.8
- github.com/mattn/go-sqlite3 v1.14.7 // indirect
+ github.com/iancoleman/strcase v0.2.0
+ github.com/klauspost/cpuid/v2 v2.0.9 // indirect
+ github.com/klauspost/reedsolomon v1.9.13 // indirect
+ github.com/lucas-clemente/quic-go v0.24.0
+ github.com/mattn/go-colorable v0.1.11
+ github.com/mattn/go-sqlite3 v1.14.9 // indirect
  github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
- github.com/miekg/dns v1.1.42
+ github.com/miekg/dns v1.1.43
  github.com/mitchellh/go-wordwrap v1.0.1
  github.com/montanaflynn/stats v0.6.6
- github.com/ooni/oohttp v0.0.0-20210908222758-cba9b1ce5ecf
- github.com/ooni/probe-assets v0.3.1
- github.com/ooni/psiphon v0.8.0
+ github.com/onsi/ginkgo v1.16.5 // indirect
+ github.com/ooni/oohttp v0.0.0-20211019141953-f1c2702fbb1e
+ github.com/ooni/probe-assets v0.5.0
+ github.com/ooni/psiphon v0.9.0
  github.com/oschwald/geoip2-golang v1.5.0
  github.com/pborman/getopt/v2 v2.1.0
  github.com/pion/stun v0.3.5
+ github.com/pion/webrtc/v3 v3.1.5 // indirect
  github.com/pkg/errors v0.9.1
  github.com/rogpeppe/go-internal v1.8.0
- github.com/rubenv/sql-migrate v0.0.0-20210408115534-a32ed26c37ea
+ github.com/rubenv/sql-migrate v0.0.0-20210614095031-55d5740dbbcc
  github.com/sirupsen/logrus v1.7.0 // indirect
+ github.com/tjfoc/gmsm v1.4.1 // indirect
+ github.com/xtaci/smux v1.5.16 // indirect
  github.com/ziutek/mymysql v1.5.4 // indirect
  gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b
  gitlab.com/yawning/utls.git v0.0.12-1
- golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
- golang.org/x/mod v0.5.0 // indirect
- golang.org/x/net v0.0.0-20210908191846-a5e095526f91
- golang.org/x/sys v0.0.0-20210817190340-bfb29a6856f2
+ golang.org/x/mod v0.5.1 // indirect
+ golang.org/x/net v0.0.0-20211020060615-d418f374d309
+ golang.org/x/sys v0.0.0-20211020064051-0ec99a608a1b
  golang.org/x/text v0.3.7 // indirect
- golang.org/x/tools v0.1.5 // indirect
+ golang.org/x/tools v0.1.7 // indirect
  gopkg.in/AlecAivazis/survey.v1 v1.8.8
  gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect
  upper.io/db.v3 v3.8.0+incompatible