Skip to content

Commit

Permalink
chore: update go version (#1645)
Browse files Browse the repository at this point in the history
## Checklist

- [x] I have read the [contribution
guidelines](https://github.com/ooni/probe-cli/blob/master/CONTRIBUTING.md)
- [x] reference issue for this pull request:
ooni/probe#2783
- [ ] if you changed anything related to how experiments work and you
need to reflect these changes in the ooni/spec repository, please link
to the related ooni/spec pull request: <!-- add URL here -->
- [ ] if you changed code inside an experiment, make sure you bump its
version number

<!-- Reminder: Location of the issue tracker:
https://github.com/ooni/probe -->

## Description

This diff updates the go version to `v1.21.11` and the `oocrypto` and
`oohttp` to the latest versions
  • Loading branch information
DecFox authored Aug 7, 2024
1 parent 0b81c46 commit f2d76f3
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.oonith
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,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=
Expand Down

0 comments on commit f2d76f3

Please sign in to comment.