chore: upgrade to go1.18.2 (#750)

I have not upgraded ooni/go yet because I am also checking whether it would be possible instead to use ooni/oocrypto as documented in the ooni/probe#2106 issue. Closes ooni/probe#2070 Closes ooni/probe#2077
ooni · May 22, 2022 · a1df3b4 · a1df3b4
1 parent 395961c
commit a1df3b4
Show file tree

Hide file tree

Showing 23 changed files with 26 additions and 451 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.10"
+          go-version: "1.18.2"
       - 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.10"
+          go-version: "1.18.2"
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -13,7 +13,6 @@ jobs:
     strategy:
       matrix:
         go:
-          - "1.17.10"
           - "1.18.2"
     steps:
       - uses: magnetikonline/action-golang-cache@v2

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.10"
+          go-version: "1.18.2"
       - 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.10"
+          go-version: "1.18.2"
       - 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.10"
+          go-version: "1.18.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
@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v1
         with:
-          go-version: "1.17.10"
+          go-version: "1.18.2"
       - 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.10"
+          go-version: "1.18.2"
 
       - 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.10" ]
+        go: [ "1.18.2" ]
         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.10"
+          go-version: "1.18.2"
 
       - 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.10"
+          go-version: "1.18.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.17.10"
+          go-version: "1.18.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.17.10"
+          go-version: "1.18.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.17.10"
+          go-version: "1.18.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.17.10"
+          go-version: "1.18.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.17.10"
+          go-version: "1.18.2"
       - 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.10
+          go-version: "1.18.2"
       - 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.10"
+          go-version: "1.18.2"
       - 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-20220519121528-b149a1255625
+	github.com/ooni/oohttp v0.0.0-20220521113303-fb27ebcf5f1e
 	github.com/ooni/probe-assets v0.9.0
 	github.com/ooni/psiphon/tunnel-core v0.0.0-20220519122549-9c044eb6bd83
 	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-20220518034528-6f7dac969898
-	golang.org/x/net v0.0.0-20220517181318-183a9ca12b87
+	golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2
 	golang.org/x/sys v0.0.0-20220519141025-dcacdad47464
 )
 

diff --git a/go.sum b/go.sum
@@ -614,8 +614,8 @@ github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE=
 github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
 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-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/oohttp v0.0.0-20220521113303-fb27ebcf5f1e h1:hM6+SmEh6aCzXZDIHTwA0UeyjXNy7EfK1NpE3zr3WBo=
+github.com/ooni/oohttp v0.0.0-20220521113303-fb27ebcf5f1e/go.mod h1:p2VVLbs+BXBIgTHITV9Vw8Rv6G1u66JUWP/8KCgDGNo=
 github.com/ooni/probe-assets v0.9.0 h1:RBqouztuKP0kWJzYwBjY0fPiwl5MQ8Aosy6ks8j1hR4=
 github.com/ooni/probe-assets v0.9.0/go.mod h1:N0PyNM3aadlYDDCFXAPzs54HC54+MZA/4/xnCtd9EAo=
 github.com/ooni/psiphon/tunnel-core v0.0.0-20220519122549-9c044eb6bd83 h1:xflU9CdKoHLMhVpt/beum7xw5erAR20wKawZSNWoJAA=
@@ -1075,8 +1075,8 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
 golang.org/x/net v0.0.0-20220401154927-543a649e0bdd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220412020605-290c469a71a5/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/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/net v0.0.0-20220520000938-2e3eb7b945c2 h1:NWy5+hlRbC7HK+PmcXVUmW1IMyFce7to56IUvhUFm7Y=
+golang.org/x/net v0.0.0-20220520000938-2e3eb7b945c2/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/internal/archival/quic_test.go b/internal/archival/quic_test.go
@@ -1,5 +1,3 @@
-//go:build !go1.18
-
 package archival
 
 import (
@@ -14,7 +12,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/lucas-clemente/quic-go"
-	"github.com/marten-seemann/qtls-go1-17" // it's annoying to depend on that
+	"github.com/marten-seemann/qtls-go1-18" // it's annoying to depend on that
 	"github.com/ooni/probe-cli/v3/internal/fakefill"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/model/mocks"