Prepare 3.10.0-beta release (ooni#313)

This diff implements part of the release checklist at ooni/probe#1439. The plan is to bless a beta release and use it for further testing on Android devices. Afterward, we need to apply some extra changes to the `cli` (including ooni#314 and ooni#312). Finally, we will bless a full 3.10.0 release.
ainghazal · Apr 28, 2021 · 7eebf69 · 7eebf69
1 parent abff585
commit 7eebf69
Show file tree

Hide file tree

Showing 22 changed files with 190 additions and 377 deletions.
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -19,6 +19,3 @@ jobs:
       - run: ./build-android.bash
         env:
           ANDROID_HOME: /usr/local/Caskroom/android-sdk/4333796
-      - run: ./publish-android.bash
-        env:
-          MOBILE_BINTRAY_API_KEY: ${{ secrets.MOBILE_BINTRAY_API_KEY }}
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -13,6 +13,3 @@ jobs:
           go-version: "1.16"
       - uses: actions/checkout@v2
       - run: ./build-ios.bash
-      - run: ./publish-ios.bash
-        env:
-          MOBILE_BINTRAY_API_KEY: ${{ secrets.MOBILE_BINTRAY_API_KEY }}
diff --git a/build-ios.bash b/build-ios.bash
@@ -7,7 +7,7 @@ go get -u golang.org/x/mobile/cmd/gomobile
 gomobile init
 output=MOBILE/ios/oonimkall.framework
 gomobile bind -target=ios -o $output -ldflags="-s -w" ./pkg/oonimkall
-release=$(git describe --tags)
+release=$(git describe --tags || echo $GITHUB_SHA)
 version=$(date -u +%Y.%m.%d-%H%M%S)
 podspecfile=./MOBILE/ios/oonimkall.podspec
 (cd ./MOBILE/ios && rm -f oonimkall.framework.zip && zip -yr oonimkall.framework.zip oonimkall.framework)

diff --git a/go.mod b/go.mod
@@ -6,6 +6,7 @@ require (
 	filippo.io/age v1.0.0-rc.1
 	git.torproject.org/pluggable-transports/goptlib.git v1.1.0
 	github.com/alecthomas/kingpin v2.2.6+incompatible
+	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
 	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
 	github.com/apex/log v1.9.0
 	github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
@@ -20,26 +21,26 @@ require (
 	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.20.0
+	github.com/lucas-clemente/quic-go v0.20.1
 	github.com/mattn/go-colorable v0.1.8
-	github.com/mattn/go-sqlite3 v1.14.6 // indirect
+	github.com/mattn/go-sqlite3 v1.14.7 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
 	github.com/miekg/dns v1.1.41
-	github.com/montanaflynn/stats v0.6.5
-	github.com/ooni/probe-assets v0.0.0-20210401100648-90ed7b6dff90
-	github.com/ooni/psiphon v0.6.0
+	github.com/montanaflynn/stats v0.6.6
+	github.com/ooni/probe-assets v0.2.0
+	github.com/ooni/psiphon v0.7.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/pkg/errors v0.9.1
 	github.com/rogpeppe/go-internal v1.8.0
-	github.com/rubenv/sql-migrate v0.0.0-20210215143335-f84234893558
+	github.com/rubenv/sql-migrate v0.0.0-20210408115534-a32ed26c37ea
 	github.com/sirupsen/logrus v1.7.0 // indirect
+	github.com/ziutek/mymysql v1.5.4 // indirect
 	gitlab.com/yawning/obfs4.git v0.0.0-20201217005658-f638c33f6c6f
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect
-	golang.org/x/net v0.0.0-20210331060903-cb1fcc7394e5
-	golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44
-	golang.org/x/text v0.3.5 // indirect
+	golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b // indirect
+	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
+	golang.org/x/sys v0.0.0-20210426080607-c94f62235c83
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/AlecAivazis/survey.v1 v1.8.8
 	gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22 // indirect

diff --git a/go.sum b/go.sum
diff --git a/internal/engine/httpheader/useragent.go b/internal/engine/httpheader/useragent.go
@@ -3,8 +3,8 @@ package httpheader
 
 // UserAgent returns the User-Agent header used for measuring.
 func UserAgent() string {
-	// 11.4% as of Mar 31, 2021 according to https://techblog.willshouse.com/2012/01/03/most-common-user-agents/
-	const ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.90 Safari/537.36"
+	// 9.6% as of Apr 26, 2021 according to https://techblog.willshouse.com/2012/01/03/most-common-user-agents/
+	const ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36"
 	return ua
 }
 

diff --git a/internal/engine/netx/gocertifi/certifi.go b/internal/engine/netx/gocertifi/certifi.go
diff --git a/internal/engine/ooapi/apis.go b/internal/engine/ooapi/apis.go
diff --git a/internal/engine/ooapi/apis_test.go b/internal/engine/ooapi/apis_test.go
diff --git a/internal/engine/ooapi/caching.go b/internal/engine/ooapi/caching.go
diff --git a/internal/engine/ooapi/caching_test.go b/internal/engine/ooapi/caching_test.go
diff --git a/internal/engine/ooapi/callers.go b/internal/engine/ooapi/callers.go
diff --git a/internal/engine/ooapi/clientcall.go b/internal/engine/ooapi/clientcall.go
diff --git a/internal/engine/ooapi/clientcall_test.go b/internal/engine/ooapi/clientcall_test.go
diff --git a/internal/engine/ooapi/cloners.go b/internal/engine/ooapi/cloners.go
diff --git a/internal/engine/ooapi/fakeapi_test.go b/internal/engine/ooapi/fakeapi_test.go
diff --git a/internal/engine/ooapi/login.go b/internal/engine/ooapi/login.go
diff --git a/internal/engine/ooapi/login_test.go b/internal/engine/ooapi/login_test.go
diff --git a/internal/engine/ooapi/requests.go b/internal/engine/ooapi/requests.go
diff --git a/internal/engine/ooapi/responses.go b/internal/engine/ooapi/responses.go
diff --git a/internal/engine/ooapi/swagger_test.go b/internal/engine/ooapi/swagger_test.go
diff --git a/internal/version/version.go b/internal/version/version.go
@@ -3,5 +3,5 @@ package version
 
 const (
 	// Version is the software version
-	Version = "3.10.0-alpha.1"
+	Version = "3.10.0-beta"
 )