c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[forwardport] chore: use go1.17.3 (#588) (#589)

Browse Source 
This diff forward ports adcb0f9ae3b9e074c301d4f7f0e8f2d0ef6466b9.

Original commit message:

- - -

- ensure we use go1.17.3 in workflows

- update to a version of ooni/oohttp that uses go1.17.3

This change WILL need to be forward ported to master.

Closes https://github.com/ooni/probe/issues/1861
This commit is contained in:
Simone Basso 2021-11-10 14:18:04 +01:00 committed by GitHub
parent 0d65438ea1
commit 4d80f7d9f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/alltests.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: go test -race -tags shaping ./... - run: go test -race -tags shaping ./...

2
.github/workflows/android.yml vendored
View File

@ -11,6 +11,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./mk OONI_PSIPHON_TAGS="" ./MOBILE/android/oonimkall.aar - run: ./mk OONI_PSIPHON_TAGS="" ./MOBILE/android/oonimkall.aar

2
.github/workflows/coverage.yml vendored
View File

@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
go: [ "1.17.2" ] go: [ "1.17.3" ]
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:

2
.github/workflows/generate.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: go generate ./... - run: go generate ./...

2
.github/workflows/ios.yml vendored
View File

@ -11,6 +11,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./mk OONI_PSIPHON_TAGS="" XCODE_VERSION=12.4 ./MOBILE/ios/oonimkall.framework.zip - run: ./mk OONI_PSIPHON_TAGS="" XCODE_VERSION=12.4 ./MOBILE/ios/oonimkall.framework.zip

2
.github/workflows/jafar.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: go build -v ./internal/cmd/jafar - run: go build -v ./internal/cmd/jafar
- run: sudo ./testjafar.bash - run: sudo ./testjafar.bash

2
.github/workflows/macos.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./mk OONI_PSIPHON_TAGS="" ./CLI/darwin/amd64/ooniprobe - run: ./mk OONI_PSIPHON_TAGS="" ./CLI/darwin/amd64/ooniprobe
- run: ./E2E/ooniprobe.sh ./CLI/darwin/amd64/ooniprobe - run: ./E2E/ooniprobe.sh ./CLI/darwin/amd64/ooniprobe

2
.github/workflows/miniooni.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./mk OONI_PSIPHON_TAGS="" ./CLI/miniooni - run: ./mk OONI_PSIPHON_TAGS="" ./CLI/miniooni

2
.github/workflows/netxlite.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
runs-on: "${{ matrix.os }}" runs-on: "${{ matrix.os }}"
strategy: strategy:
matrix: matrix:
go: [ "1.17.2" ] go: [ "1.17.3" ]
os: [ "ubuntu-20.04", "windows-2019", "macos-10.15" ] os: [ "ubuntu-20.04", "windows-2019", "macos-10.15" ]
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1

2
.github/workflows/oohelperd.yml vendored
View File

@ -13,7 +13,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- name: build oohelperd binary - name: build oohelperd binary
run: GOOS=linux GOARCH=amd64 go build -v ./internal/cmd/oohelperd run: GOOS=linux GOARCH=amd64 go build -v ./internal/cmd/oohelperd

2
.github/workflows/qafbmessenger.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./QA/rundocker.bash "fbmessenger" - run: ./QA/rundocker.bash "fbmessenger"

2
.github/workflows/qahhfm.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./QA/rundocker.bash "hhfm" - run: ./QA/rundocker.bash "hhfm"

2
.github/workflows/qahirl.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./QA/rundocker.bash "hirl" - run: ./QA/rundocker.bash "hirl"

2
.github/workflows/qatelegram.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./QA/rundocker.bash "telegram" - run: ./QA/rundocker.bash "telegram"

2
.github/workflows/qawebconnectivity.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./QA/rundocker.bash "webconnectivity" - run: ./QA/rundocker.bash "webconnectivity"

2
.github/workflows/qawhatsapp.yml vendored
View File

@ -10,6 +10,6 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: ./QA/rundocker.bash "whatsapp" - run: ./QA/rundocker.bash "whatsapp"

2
.github/workflows/windows.yml vendored
View File

@ -10,7 +10,7 @@ jobs:
steps: steps:
- uses: actions/setup-go@v1 - uses: actions/setup-go@v1
with: with:
go-version: "1.17.2" go-version: "1.17.3"
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: sudo apt install mingw-w64 - run: sudo apt install mingw-w64
- run: ./mk OONI_PSIPHON_TAGS="" MINGW_W64_VERSION="9.3-win32" ./CLI/windows/amd64/ooniprobe.exe - run: ./mk OONI_PSIPHON_TAGS="" MINGW_W64_VERSION="9.3-win32" ./CLI/windows/amd64/ooniprobe.exe

4
go.mod
View File

@ -32,7 +32,7 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1 github.com/mitchellh/go-wordwrap v1.0.1
github.com/montanaflynn/stats v0.6.6 github.com/montanaflynn/stats v0.6.6
github.com/onsi/ginkgo v1.16.5 // indirect github.com/onsi/ginkgo v1.16.5 // indirect
github.com/ooni/oohttp v0.0.0-20211019141953-f1c2702fbb1e github.com/ooni/oohttp v0.0.0-20211110125146-9fc06c067bd6
github.com/ooni/probe-assets v0.5.0 github.com/ooni/probe-assets v0.5.0
github.com/ooni/psiphon v0.9.0 github.com/ooni/psiphon v0.9.0
github.com/oschwald/geoip2-golang v1.5.0 github.com/oschwald/geoip2-golang v1.5.0
@ -49,7 +49,7 @@ require (
gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b gitlab.com/yawning/obfs4.git v0.0.0-20210511220700-e330d1b7024b
gitlab.com/yawning/utls.git v0.0.12-1 gitlab.com/yawning/utls.git v0.0.12-1
golang.org/x/mod v0.5.1 // indirect golang.org/x/mod v0.5.1 // indirect
golang.org/x/net v0.0.0-20211020060615-d418f374d309 golang.org/x/net v0.0.0-20211109214657-ef0fda0de508
golang.org/x/sys v0.0.0-20211020064051-0ec99a608a1b golang.org/x/sys v0.0.0-20211020064051-0ec99a608a1b
golang.org/x/text v0.3.7 // indirect golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.7 // indirect golang.org/x/tools v0.1.7 // indirect

8
go.sum
View File

@ -418,8 +418,8 @@ github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDs
github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg= github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg=
github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak= github.com/onsi/gomega v1.13.0 h1:7lLHu94wT9Ij0o6EWWclhu0aOh32VxhkwEJvzuWPeak=
github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
github.com/ooni/oohttp v0.0.0-20211019141953-f1c2702fbb1e h1:qxMkCUolEF15N0t/z823I4eRwYIih+nglhcWWfeg3WU= github.com/ooni/oohttp v0.0.0-20211110125146-9fc06c067bd6 h1:o1Uwpkw+KfJEhiqhnfcEIkXNVnyV6tVgllATZEWmNGw=
github.com/ooni/oohttp v0.0.0-20211019141953-f1c2702fbb1e/go.mod h1:kgtoj+Dn4bmx09hEUgbPI7YX0gkWlu+fz2I0S5auyX4= github.com/ooni/oohttp v0.0.0-20211110125146-9fc06c067bd6/go.mod h1:kgtoj+Dn4bmx09hEUgbPI7YX0gkWlu+fz2I0S5auyX4=
github.com/ooni/probe-assets v0.5.0 h1:4pfiyYaWfWaK4isokNAEYOwHqOISTOqm2kd/2MquWh8= github.com/ooni/probe-assets v0.5.0 h1:4pfiyYaWfWaK4isokNAEYOwHqOISTOqm2kd/2MquWh8=
github.com/ooni/probe-assets v0.5.0/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo= github.com/ooni/probe-assets v0.5.0/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo=
github.com/ooni/psiphon v0.9.0 h1:THWP09pYSKzoq9RIKZWuz9367ho9bri9lKxkMu8VsM8= github.com/ooni/psiphon v0.9.0 h1:THWP09pYSKzoq9RIKZWuz9367ho9bri9lKxkMu8VsM8=
@ -765,8 +765,8 @@ golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT
golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211005001312-d4b1ae081e3b/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211020060615-d418f374d309 h1:A0lJIi+hcTR6aajJH4YqKWwohY4aW9RO7oRMcdv+HKI= golang.org/x/net v0.0.0-20211109214657-ef0fda0de508 h1:v3NKo+t/Kc3EASxaKZ82lwK6mCf4ZeObQBduYFZHo7c=
golang.org/x/net v0.0.0-20211020060615-d418f374d309/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211109214657-ef0fda0de508/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=