chore: use go1.17.10 (#740)

See ooni/probe#2100
ooni · May 19, 2022 · 5c2f031 · 5c2f031
1 parent 30e1ed9
commit 5c2f031
Show file tree

Hide file tree

Showing 21 changed files with 27 additions and 27 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.17.9"
+          go-version: "1.17.10"
       - uses: actions/checkout@v2
       - run: go test -race -tags shaping ./...
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.9"
+          go-version: "1.17.10"
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -13,8 +13,8 @@ jobs:
     strategy:
       matrix:
         go:
-          - "1.17.9"
-          - "1.18.1"
+          - "1.17.10"
+          - "1.18.2"
     steps:
       - uses: magnetikonline/action-golang-cache@v2
         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.17.9"
+          go-version: "1.17.10"
       - uses: actions/checkout@v2
       - run: go generate ./...
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.9"
+          go-version: "1.17.10"
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0

diff --git a/.github/workflows/jafar.yml b/.github/workflows/jafar.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.9"
+          go-version: "1.17.10"
       - 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
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.9"
+          go-version: "1.17.10"
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0

diff --git a/.github/workflows/miniooni.yml b/.github/workflows/miniooni.yml
@@ -19,7 +19,7 @@ jobs:
 
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.9"
+          go-version: "1.17.10"
 
       - uses: actions/checkout@v2
         with:

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.9" ]
+        go: [ "1.17.10" ]
         os: [ "ubuntu-20.04", "windows-2019", "macos-10.15" ]
     steps:
       - uses: magnetikonline/action-golang-cache@v2

diff --git a/.github/workflows/oohelperd.yml b/.github/workflows/oohelperd.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.9"
+          go-version: "1.17.10"
 
       - name: build oohelperd binary
         run: GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -o ./CLI/oohelperd-linux-amd64 -v -tags netgo -ldflags="-s -w -extldflags -static" ./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.17.9"
+          go-version: "1.17.10"
       - 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.17.9"
+          go-version: "1.17.10"
       - 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.17.9"
+          go-version: "1.17.10"
       - 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.17.9"
+          go-version: "1.17.10"
       - 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.17.9"
+          go-version: "1.17.10"
       - 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.17.9"
+          go-version: "1.17.10"
       - uses: actions/checkout@v2
       - run: ./QA/rundocker.bash "whatsapp"
diff --git a/.github/workflows/tarball.yml b/.github/workflows/tarball.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17.9
+          go-version: 1.17.10
       - name: Generate release tarball
         run: |
           VERSION=${GITHUB_REF_NAME#v}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.9"
+          go-version: "1.17.10"
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0

diff --git a/go.mod b/go.mod
@@ -27,7 +27,7 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/montanaflynn/stats v0.6.6
 	github.com/ooni/go-libtor v1.1.5
-	github.com/ooni/oohttp v0.0.0-20220412070944-b683bc0f8d53
+	github.com/ooni/oohttp v0.0.0-20220519121528-b149a1255625
 	github.com/ooni/probe-assets v0.8.0
 	github.com/ooni/psiphon/tunnel-core v0.0.0-20220412085408-7a0d17ea91f8
 	github.com/oschwald/geoip2-golang v1.7.0
@@ -40,7 +40,7 @@ require (
 	gitlab.com/yawning/obfs4.git v0.0.0-20220204003609-77af0cba934d
 	gitlab.com/yawning/utls.git v0.0.12-1
 	golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4
-	golang.org/x/net v0.0.0-20220412020605-290c469a71a5
+	golang.org/x/net v0.0.0-20220517181318-183a9ca12b87
 	golang.org/x/sys v0.0.0-20220422013727-9388b58f7150
 )
 

diff --git a/go.sum b/go.sum
@@ -606,8 +606,8 @@ github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAl
 github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw=
 github.com/ooni/go-libtor v1.1.5 h1:YbwXR9aLuL37EwL7rksPCQQhcHwoxU+M/v+jwZR+n5Y=
 github.com/ooni/go-libtor v1.1.5/go.mod h1:q1YyLwRD9GeMyeerVvwc0vJ2YgwDLTp2bdVcrh/JXyI=
-github.com/ooni/oohttp v0.0.0-20220412070944-b683bc0f8d53 h1:q9d87uFS2FdZVjh87pRwQ/CkEDdXpgpSFioANCAHrgw=
-github.com/ooni/oohttp v0.0.0-20220412070944-b683bc0f8d53/go.mod h1:94RvV+x6crHzYeO8c/LUtkK4uY7QX2kldN3RyvThgzU=
+github.com/ooni/oohttp v0.0.0-20220519121528-b149a1255625 h1:tSggIjFQEd3y3W/SInOPeLHxYHhs6+UFgbK5I+Z5G2g=
+github.com/ooni/oohttp v0.0.0-20220519121528-b149a1255625/go.mod h1:94RvV+x6crHzYeO8c/LUtkK4uY7QX2kldN3RyvThgzU=
 github.com/ooni/probe-assets v0.8.0 h1:/i3Yqzx5Wvcm8kV8hnDq9kS4d7GC5ja6W8VBPFnekso=
 github.com/ooni/probe-assets v0.8.0/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo=
 github.com/ooni/psiphon/tunnel-core v0.0.0-20220412085408-7a0d17ea91f8 h1:dePUsZ5CNtf403dtdQMxj3XfQjcpZocVhCKMWcwU90k=
@@ -1062,8 +1062,8 @@ golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5 h1:bRb386wvrE+oBNdF1d/Xh9mQrfQ4ecYhW5qJ5GvTGT4=
-golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220517181318-183a9ca12b87 h1:cCR+9mKLOGyX4Zx+uBZDXEDAQsvKQ/XbW4vreG5v1jU=
+golang.org/x/net v0.0.0-20220517181318-183a9ca12b87/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 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-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

diff --git a/mk b/mk
@@ -64,15 +64,15 @@ GOLANG_EXTRA_FLAGS =
 
 #help:
 #help: * GOLANG_VERSION_NUMBER : the expected version number for golang.
-GOLANG_VERSION_NUMBER = 1.17.9
+GOLANG_VERSION_NUMBER = 1.17.10
 
 #help:
 #help: * MINGW_W64_VERSION     : the expected mingw-w64 version.
 MINGW_W64_VERSION = 10.3.1
 
 #help:
 #help: * OONIGO_BRANCH         : the github.com/ooni/go branch to use.
-OONIGO_BRANCH = oonigo1.17.9
+OONIGO_BRANCH = oonigo1.17.10
 
 #help:
 #help: * OONI_PSIPHON_TAGS     : build tags for `go build -tags ...` that cause