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.

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

Backport of [NET-4968] Upgrade Go to 1.21 into release/1.17.x #20182

Merged

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #20062 to be assessed for backporting due to the inclusion of the label backport/1.17.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Description

Upgrade Go to 1.21.

This is needed in advance of the EOL of Go 1.20 ~Feb. 1. The ideal timing is before our next patch release scheduled for the end of January.

A follow-up change will introduce toolchain directives to pin to the latest version; the hope is to use a root-level go.work to accomplish this, which requires some additional changes to support. See #20058 for more context.

That PR should set this change up to cleanly backport and sync without intervention 🤞🏻

Testing & Reproduction steps

Tests continue to pass, and Go 1.21 can be observed as the output of get-go-version.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Jan 12, 2024

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@zalimeni zalimeni force-pushed the backport/zalimeni/go-1.21/normally-talented-possum branch from 6d1d1eb to b0c7842 Compare January 12, 2024 15:04
@zalimeni
Copy link
Member

Resolved whitespace and Makefile no-op conflicts.

@zalimeni zalimeni marked this pull request as ready for review January 12, 2024 15:04
@zalimeni zalimeni enabled auto-merge (squash) January 12, 2024 15:04
@zalimeni zalimeni merged commit fa8fa25 into release/1.17.x Jan 12, 2024
98 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/go-1.21/normally-talented-possum branch January 12, 2024 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants