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

[3.4] Update golang toolchain to 1.23.6 #19429

Merged
merged 1 commit into from
Feb 18, 2025
Merged

[3.4] Update golang toolchain to 1.23.6 #19429

merged 1 commit into from
Feb 18, 2025

Conversation

joshjms
Copy link
Contributor

@joshjms joshjms commented Feb 17, 2025 •
edited
Loading

  • Update .go-version to 1.23.6
  • Update Go version in go.mod files to 1.23.0
  • Update toolchain to 1.23.6

Subtask of #19417

@k8s-ci-robot
Copy link

Hi @joshjms. Thanks for your PR.

I'm waiting for a etcd-io member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

mmorel-35
mmorel-35 reviewed Feb 17, 2025
View reviewed changes
go.mod
@@ -1,8 +1,8 @@
module go.etcd.io/etcd

go 1.22
go 1.23
Copy link
Contributor

@mmorel-35 mmorel-35 Feb 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is equivalent to latest patch version of go 1.23, is this your intention or using 1.23.0 would be more appropriate ?

Defining the patch version forces the modules depending on this one to upgrade their own go module version, so I would recommend using go 1.23.0 with toolchain using latest patch version of the go version

Copy link
Contributor Author

@joshjms joshjms Feb 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I referred to the go.mod file in the main branch. Will change accordingly.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can keep 1.23.6 as currently used version for the project (.go-version and toolchains directives) . It's just the go directive in go.mod that shall use 1.23.0

Copy link
Contributor Author

@joshjms joshjms Feb 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, thanks a lot! I'll update in my PR for release-3.5 as well. As of this reply, I have changed the go directives.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

iiuc, we don't use patch in go.mod

only the toolchain

cc @ivanvc @henrybear327

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's just my humble recommendation

ahrtr
ahrtr reviewed Feb 17, 2025
View reviewed changes
go.mod Outdated
@@ -1,8 +1,8 @@
module go.etcd.io/etcd

go 1.22
go 1.23.0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we use "1.23"?

Same comment as #19430 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I'll change it.

If I'm not mistaken, the go directive is just there to enforce the minimum version to build, therefore 1.23 and 1.23.0 should be the same.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

therefore 1.23 and 1.23.0 should be the same.

It's true, but "1.23" is preferred,

  • It's more explicit that we don't require/force any applications (which depend on etcd) to use any go patch version.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.23 is not equal to 1.23.0 but to 1.23.6 until 1.23.7 comes up

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I'm under the impression that 1.23 = 1.23.x (compatible with any x). So in the case where the minimum version is 1.23, it will take 1.23.0 (as it is the minimum of all 1.23.x). Thanks for the insights.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahrtr done

@ahrtr
Copy link
Member

ahrtr commented Feb 17, 2025

please squash the commit

@ivanvc
Copy link
Member

ivanvc commented Feb 17, 2025

/ok-to-test

@joshjms
bump go to v1.23.6
2d2b20e 
Signed-off-by: joshjms <[email protected]>

update go directive in go.mod to 1.23.0

Signed-off-by: joshjms <[email protected]>

change go directive to 1.23

Signed-off-by: joshjms <[email protected]>
@joshjms joshjms force-pushed the bump-go-v1.23.6-release-3.4 branch from 7f79f56 to 2d2b20e Compare February 17, 2025 20:05
@joshjms
Copy link
Contributor Author

joshjms commented Feb 17, 2025 •
edited
Loading

i squashed the commit @ahrtr

@ivanvc ivanvc closed this Feb 18, 2025
@ivanvc ivanvc reopened this Feb 18, 2025
@ivanvc
Copy link
Member

ivanvc commented Feb 18, 2025

@ahrtr / @jmhbnz, can you manually approve the workflows? Neither /ok-to-test nor closing and reopening triggered the tests. Thanks.

@ivanvc ivanvc mentioned this pull request Feb 18, 2025
Open
16 tasks
ahrtr
ahrtr approved these changes Feb 18, 2025
View reviewed changes
Copy link
Member

@ahrtr ahrtr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thank you!

ivanvc
ivanvc approved these changes Feb 18, 2025
View reviewed changes
Copy link
Member

@ivanvc ivanvc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks, @joshjms.

@k8s-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ahrtr, ivanvc, joshjms, mmorel-35

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ahrtr ahrtr merged commit 4b13b1a into etcd-io:release-3.4 Feb 18, 2025
18 checks passed
@ivanvc ivanvc mentioned this pull request Feb 19, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Elbehery Elbehery Elbehery left review comments

@ivanvc ivanvc ivanvc approved these changes

@mmorel-35 mmorel-35 mmorel-35 approved these changes

@ahrtr ahrtr ahrtr approved these changes

Assignees
No one assigned
Labels
approved ok-to-test size/S stage/merge-when-tests-green
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@joshjms @k8s-ci-robot @ahrtr @ivanvc @Elbehery @mmorel-35