From 36cbfad0920bf59e241e6c4b851787bd6b99aab2 Mon Sep 17 00:00:00 2001 From: decfox Date: Wed, 7 Aug 2024 14:07:12 +0530 Subject: [PATCH 1/3] chore: updare to go v1.21.11 --- GOVERSION | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GOVERSION b/GOVERSION index ae7bbdf047..88863fd8e3 100644 --- a/GOVERSION +++ b/GOVERSION @@ -1 +1 @@ -1.21.10 +1.21.11 diff --git a/go.mod b/go.mod index 506266d1ad..f856084b10 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/ooni/probe-cli/v3 go 1.21 -toolchain go1.21.10 +toolchain go1.21.11 require ( filippo.io/age v1.1.1 From 4a316a001e70d30fcc739332612ada7ca3959ccd Mon Sep 17 00:00:00 2001 From: decfox Date: Wed, 7 Aug 2024 17:58:01 +0530 Subject: [PATCH 2/3] chore: update oocrypto and oohttp to latest versions --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index f856084b10..18cd3e3d28 100644 --- a/go.mod +++ b/go.mod @@ -28,8 +28,8 @@ require ( github.com/montanaflynn/stats v0.7.1 github.com/ooni/minivpn v0.0.6 github.com/ooni/netem v0.0.0-20240208095707-608dcbcd82b8 - github.com/ooni/oocrypto v0.6.1 - github.com/ooni/oohttp v0.7.2 + github.com/ooni/oocrypto v0.6.2 + github.com/ooni/oohttp v0.7.3 github.com/ooni/probe-assets v0.23.0 github.com/pborman/getopt/v2 v2.1.0 github.com/pion/stun v0.6.1 diff --git a/go.sum b/go.sum index c54eab98f7..d427fb2598 100644 --- a/go.sum +++ b/go.sum @@ -356,10 +356,10 @@ github.com/ooni/minivpn v0.0.6 h1:pGTsYRtofEupMrJL28f1IXO1LJslSI7dEHxSadNgGik= github.com/ooni/minivpn v0.0.6/go.mod h1:0KNwmK2Wg9lDbk936XjtxvCq4tPNbK4C3IJvyLwIMrE= 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.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/oocrypto v0.6.2 h1:gAg24bVP03PNsOkMYGxllxmvlKlBOvyHmFAsdBlFJag= +github.com/ooni/oocrypto v0.6.2/go.mod h1:mGlPZeI3jV1gnVQ3xs5WYNo8IoYlyB/p/x79P58hhog= +github.com/ooni/oohttp v0.7.3 h1:/EjyY5kgy9zq68YTSYtjd0rkJv5+/U6bzHM3fYqYHXY= +github.com/ooni/oohttp v0.7.3/go.mod h1:6mjMEE8uA2wODu93EABmtmbjy0/YuORNNcRY9Dw2ncw= github.com/ooni/probe-assets v0.23.0 h1:QNagQEgyRpM5tC0yHhUU3x0+L4gjr8p8nzMl+TUI3Vo= github.com/ooni/probe-assets v0.23.0/go.mod h1:m0k2FFzcLfFm7dhgyYkLCUR3R0CoRPr0jcjctDS2+gU= github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc= From 7a950f81e3b0b68da5fb92a73455e5fad0ab635b Mon Sep 17 00:00:00 2001 From: decfox Date: Wed, 7 Aug 2024 18:09:36 +0530 Subject: [PATCH 3/3] chore: update readme and dockerfile with new version --- Dockerfile.oonith | 4 ++-- Readme.md | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile.oonith b/Dockerfile.oonith index c831a99b3f..b1f365a15e 100644 --- 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.10-bullseye as builder +FROM golang:1.21.11-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.10-bullseye as runner +FROM golang:1.21.11-bullseye as runner WORKDIR /app diff --git a/Readme.md b/Readme.md index 85594cc8ad..32f4f9d728 100644 --- 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.10) and use it for building. +go1.21.11) 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.10@latest -$HOME/go/bin/go1.21.10 download +go install -v golang.org/dl/go1.21.11@latest +$HOME/go/bin/go1.21.11 download export GOTOOLCHAIN=local -$HOME/sdk/go1.21.10/bin/go build -v -ldflags '-s -w' ./internal/cmd/miniooni +$HOME/sdk/go1.21.11/bin/go build -v -ldflags '-s -w' ./internal/cmd/miniooni ``` ### Common build targets