chore: update to go1.21.10 (#1596)

See ooni/probe#2722
ooni · May 13, 2024 · d204cfb · d204cfb
1 parent cd2a9f7
commit d204cfb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/Dockerfile.oonith b/Dockerfile.oonith
@@ -3,7 +3,7 @@
 #
 # Note: The Dockerfile needs to reside in the root of the repo, so that we can
 # copy files into the docker build context.
-FROM golang:1.21.9-bullseye as builder
+FROM golang:1.21.10-bullseye as builder
 ARG BRANCH_NAME=master
 
 WORKDIR /build
@@ -13,7 +13,7 @@ COPY . .
 RUN go run ./internal/cmd/buildtool oohelperd build
 
 ## Image running on the host
-FROM golang:1.21.9-bullseye as runner
+FROM golang:1.21.10-bullseye as runner
 
 WORKDIR /app
 

diff --git a/GOVERSION b/GOVERSION
@@ -1 +1 @@
-1.21.9
+1.21.10
diff --git a/Readme.md b/Readme.md
@@ -72,7 +72,7 @@ builds use the latest commit of the `master` branch.
 To setup development for this repository you need Go >= 1.15. The
 `./script/go.bash` script will automatically download the expected
 version of Go mentioned in the [GOVERSION](GOVERSION) file (i.e.,
-go1.21.9) and use it for building.
+go1.21.10) and use it for building.
 
 You can also bypass `./script/go.bash` and build ooniprobe manually using
 `go build ...` but, in such a case, note that:
@@ -146,10 +146,10 @@ using the correct version of Go. Running this script as follows:
 Is equivalent to running these commands:
 
 ```bash
-go install -v golang.org/dl/go1.21.9@latest
-$HOME/go/bin/go1.21.9 download
+go install -v golang.org/dl/go1.21.10@latest
+$HOME/go/bin/go1.21.10 download
 export GOTOOLCHAIN=local
-$HOME/sdk/go1.21.9/bin/go build -v -ldflags '-s -w' ./internal/cmd/miniooni
+$HOME/sdk/go1.21.10/bin/go build -v -ldflags '-s -w' ./internal/cmd/miniooni
 ```
 
 ### Common build targets

diff --git a/go.mod b/go.mod
@@ -2,7 +2,7 @@ module github.com/ooni/probe-cli/v3
 
 go 1.21
 
-toolchain go1.21.9
+toolchain go1.21.10
 
 require (
 	filippo.io/age v1.1.1
@@ -27,8 +27,8 @@ require (
 	github.com/mitchellh/go-wordwrap v1.0.1
 	github.com/montanaflynn/stats v0.7.1
 	github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8
-	github.com/ooni/oocrypto v0.6.0
-	github.com/ooni/oohttp v0.7.1
+	github.com/ooni/oocrypto v0.6.1
+	github.com/ooni/oohttp v0.7.2
 	github.com/ooni/probe-assets v0.22.0
 	github.com/pborman/getopt/v2 v2.1.0
 	github.com/pion/stun v0.6.1

diff --git a/go.sum b/go.sum
@@ -379,10 +379,10 @@ github.com/onsi/gomega v1.29.0 h1:KIA/t2t5UBzoirT4H9tsML45GEbo3ouUnBHsCfD2tVg=
 github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ=
 github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8 h1:kJ2wn19lIP/y9ng85BbFRdWKHK6Er116Bbt5uhqHVD4=
 github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8/go.mod h1:b/wAvTR5n92Vk2b0SBmuMU0xO4ZGVrsXtU7zjTby7vw=
-github.com/ooni/oocrypto v0.6.0 h1:qzBxmJcqqoCsvGWgurTDev4gGtCOe0FSIuDugBdY/kE=
-github.com/ooni/oocrypto v0.6.0/go.mod h1:mGlPZeI3jV1gnVQ3xs5WYNo8IoYlyB/p/x79P58hhog=
-github.com/ooni/oohttp v0.7.1 h1:8+UJHdKvbGoqUbzeAOkz6/sI75g6k2I3I5/+HtaehX8=
-github.com/ooni/oohttp v0.7.1/go.mod h1:6mjMEE8uA2wODu93EABmtmbjy0/YuORNNcRY9Dw2ncw=
+github.com/ooni/oocrypto v0.6.1 h1:D0fGokmHoVKGBy39RxPxK77ov0Ob9Z5pdx4vKA6vpWk=
+github.com/ooni/oocrypto v0.6.1/go.mod h1:mGlPZeI3jV1gnVQ3xs5WYNo8IoYlyB/p/x79P58hhog=
+github.com/ooni/oohttp v0.7.2 h1:MtZFqq2vd0/ppYTjhKMSO5K6sj2NxVjrO7ldElWtHq4=
+github.com/ooni/oohttp v0.7.2/go.mod h1:6mjMEE8uA2wODu93EABmtmbjy0/YuORNNcRY9Dw2ncw=
 github.com/ooni/probe-assets v0.22.0 h1:Nxl7X+HdTamGKKzA4g0OKZY7zOPTY8IcHe/G9A/zrcc=
 github.com/ooni/probe-assets v0.22.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU=
 github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=