Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: upgrade to go1.21.9 #1548

Merged
merged 7 commits into from
Apr 26, 2024
Merged

chore: upgrade to go1.21.9 #1548

merged 7 commits into from
Apr 26, 2024

Conversation

bassosimone
Copy link
Contributor

@bassosimone bassosimone commented Apr 12, 2024 •
edited
Loading

@bassosimone
chore: start upgrading to go1.21.9
526de36 
Part of ooni/probe#2702.

Note that we still need to upgrade Psiphon and ideally this should
happen as part of this pull request.
@bassosimone
fix: run go mod tidy
7b49806
@bassosimone
fix: remove broken test
ff9462e
@bassosimone
Copy link
Contributor Author

I'm currently blocked by not being able to upgrade to the new version of Psiphon.

Here's what is happening:

% ./script/go.bash get -v github.com/Psiphon-Labs/psiphon-tunnel-core@71ac166e6917a8d758f2e09ca7f148f7c337a754
+ cd ./pkg/gobash
+ go build -v -o gobash.exe .
github.com/ooni/probe-cli/pkg/gobash
+ ./pkg/gobash/gobash.exe download
go1.21.9: already downloaded in /Users/sbs/sdk/go1.21.9
+ ./pkg/gobash/gobash.exe get -v github.com/Psiphon-Labs/psiphon-tunnel-core@71ac166e6917a8d758f2e09ca7f148f7c337a754
go: accepting indirect upgrade from github.com/Psiphon-Labs/quic-go@v0.0.0-20230626192210-73f29effc9da to v0.0.0-20240305203241-7c4a760d03cc
go: accepting indirect upgrade from github.com/refraction-networking/conjure@v0.7.10 to v0.7.11-0.20240130155008-c8df96195ab2
go: github.com/Psiphon-Labs/psiphon-tunnel-core@v1.0.11-0.20240405152454-71ac166e6917 requires
	github.com/Psiphon-Labs/quic-go@v0.0.0-20240305203241-7c4a760d03cc requires
	github.com/Psiphon-Labs/psiphon-tunnel-core@v2.0.28+incompatible, but v1.0.11-0.20240405152454-71ac166e6917 is requested
go: github.com/Psiphon-Labs/psiphon-tunnel-core@71ac166e6917a8d758f2e09ca7f148f7c337a754 (v1.0.11-0.20240405152454-71ac166e6917) indirectly requires github.com/Psiphon-Labs/psiphon-tunnel-core@v2.0.28+incompatible, not github.com/Psiphon-Labs/psiphon-tunnel-core@71ac166e6917a8d758f2e09ca7f148f7c337a754 (v1.0.11-0.20240405152454-71ac166e6917)

I have requested specific help to Psiphon developers to help me understand this, since I am a bit lost 🤔.

@bassosimone bassosimone marked this pull request as ready for review April 26, 2024 07:27
@bassosimone bassosimone requested a review from hellais as a code owner April 26, 2024 07:27
@bassosimone bassosimone changed the title chore: start upgrading to go1.21.9 chore: upgrade to go1.21.9 Apr 26, 2024
@bassosimone bassosimone merged commit e2a9b89 into master Apr 26, 2024
19 checks passed
@bassosimone bassosimone deleted the issue/2702 branch April 26, 2024 07:34
@BrewTestBot BrewTestBot mentioned this pull request May 22, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hellais hellais Awaiting requested review from hellais hellais is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cli: upgrade to go1.21 engine: use GOTOOLCHAIN=local
1 participant
@bassosimone