feat: start preparing for a cli release (#672)

This diff includes some final changes to be ready for blessing
a cli release. These changes are:

1. run `go generate ./...` to update the bundled CA

2. update the header we use for measuring

3. ensure `mk` uses the latest version of several tools

Reference issue: https://github.com/ooni/probe/issues/1845
This commit is contained in:
Simone Basso 2022-01-24 14:56:51 +01:00 committed by GitHub
parent d92c1641ac
commit 2a566f2046
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 29 additions and 29 deletions

View File

@ -3,8 +3,8 @@ package httpheader
// UserAgent returns the User-Agent header used for measuring. // UserAgent returns the User-Agent header used for measuring.
func UserAgent() string { func UserAgent() string {
// 15.1% as of Dec 06, 2021 according to https://techblog.willshouse.com/2012/01/03/most-common-user-agents/ // 13.2% as of Jan 24, 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/96.0.4664.45 Safari/537.36" const ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/96.0.4664.110 Safari/537.36"
return ua return ua
} }

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2021-12-06 16:54:29.970299 +0100 CET m=+1.432552960 // 2022-01-24 12:46:25.250293 +0100 CET m=+0.397835501
// https://curl.haxx.se/ca/cacert.pem // https://curl.haxx.se/ca/cacert.pem
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.991444 +0100 CET m=+0.681523834 // Generated: 2022-01-24 12:46:26.278434 +0100 CET m=+0.682175209
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.311109 +0100 CET m=+0.001174334 // Generated: 2022-01-24 12:46:25.596537 +0100 CET m=+0.000253293
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.612024 +0100 CET m=+0.302095917 // Generated: 2022-01-24 12:46:25.888165 +0100 CET m=+0.291891834
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.676029 +0100 CET m=+0.366102209 // Generated: 2022-01-24 12:46:25.948113 +0100 CET m=+0.351842251
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.747104 +0100 CET m=+0.437179042 // Generated: 2022-01-24 12:46:26.019113 +0100 CET m=+0.422844543
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.787104 +0100 CET m=+0.477179084 // Generated: 2022-01-24 12:46:26.062389 +0100 CET m=+0.466122834
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.854451 +0100 CET m=+0.544527417 // Generated: 2022-01-24 12:46:26.131178 +0100 CET m=+0.534914084
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.896609 +0100 CET m=+0.586686376 // Generated: 2022-01-24 12:46:26.173078 +0100 CET m=+0.576815459
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// Generated: 2021-12-06 16:54:30.95047 +0100 CET m=+0.640549376 // Generated: 2022-01-24 12:46:26.230445 +0100 CET m=+0.634184293
package netxlite package netxlite

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:20.329834948 +0100 CET m=+0.000081946 // 2022-01-24 12:46:26.896771 +0100 CET m=+0.000398918
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:21.011087899 +0100 CET m=+0.000148552 // 2022-01-24 12:46:27.237936 +0100 CET m=+0.000174168
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:21.763824725 +0100 CET m=+0.000091434 // 2022-01-24 12:46:27.560368 +0100 CET m=+0.000182001
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:22.460760999 +0100 CET m=+0.000133744 // 2022-01-24 12:46:27.849409 +0100 CET m=+0.000184501
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:22.981823549 +0100 CET m=+0.000269410 // 2022-01-24 12:46:28.132882 +0100 CET m=+0.000173793
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:23.476477599 +0100 CET m=+0.000137872 // 2022-01-24 12:46:28.435284 +0100 CET m=+0.000182959
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:23.995454536 +0100 CET m=+0.000235066 // 2022-01-24 12:46:28.72228 +0100 CET m=+0.000187251
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:24.519577773 +0100 CET m=+0.000226600 // 2022-01-24 12:46:29.022894 +0100 CET m=+0.000173293
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:24.965043633 +0100 CET m=+0.000133804 // 2022-01-24 12:46:29.286865 +0100 CET m=+0.000161751
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:25.464495023 +0100 CET m=+0.000224245 // 2022-01-24 12:46:29.560643 +0100 CET m=+0.000169043
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:25.956795743 +0100 CET m=+0.000211040 // 2022-01-24 12:46:29.83907 +0100 CET m=+0.000167126
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:26.453995716 +0100 CET m=+0.000074291 // 2022-01-24 12:46:30.166785 +0100 CET m=+0.000172376
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:27.025666752 +0100 CET m=+0.000120679 // 2022-01-24 12:46:30.503944 +0100 CET m=+0.000176418
package ooapi package ooapi

View File

@ -1,5 +1,5 @@
// Code generated by go generate; DO NOT EDIT. // Code generated by go generate; DO NOT EDIT.
// 2022-01-04 17:58:27.730417721 +0100 CET m=+0.001561954 // 2022-01-24 12:46:30.895457 +0100 CET m=+0.000520167
package ooapi package ooapi
@ -9,7 +9,7 @@ const swagger = `{
"swagger": "2.0", "swagger": "2.0",
"info": { "info": {
"title": "OONI API specification", "title": "OONI API specification",
"version": "0.20220104.1165827" "version": "0.20220124.1114630"
}, },
"host": "api.ooni.io", "host": "api.ooni.io",
"basePath": "/", "basePath": "/",

View File

@ -3,5 +3,5 @@ package version
const ( const (
// Version is the software version // Version is the software version
Version = "3.14.0-alpha" Version = "3.14.0-alpha.1"
) )

2
mk
View File

@ -40,7 +40,7 @@ ANDROID_CLI_VERSION = 7583922
#help: #help:
#help: * ANDROID_INSTALL_EXTRA : contains the android tools we install in addition #help: * ANDROID_INSTALL_EXTRA : contains the android tools we install in addition
#help: to the NDK in order to build oonimkall.aar. #help: to the NDK in order to build oonimkall.aar.
ANDROID_INSTALL_EXTRA = 'build-tools;29.0.3' 'platforms;android-31' ANDROID_INSTALL_EXTRA = 'build-tools;32.0.0' 'platforms;android-31'
#help: #help:
#help: * ANDROID_NDK_VERSION : Android NDK version. #help: * ANDROID_NDK_VERSION : Android NDK version.