Skip to content

Manual backport of [NET-5944] security: Upgrade Go and x/net into release/1.0.x#3089

Merged
zalimeni merged 1 commit intorelease/1.0.xfrom
backport/zalimeni/net-5944-go-update-1.20.10/manual-1.0.x
Oct 17, 2023
Merged

Manual backport of [NET-5944] security: Upgrade Go and x/net into release/1.0.x#3089
zalimeni merged 1 commit intorelease/1.0.xfrom
backport/zalimeni/net-5944-go-update-1.20.10/manual-1.0.x

Conversation

@zalimeni
Copy link
Copy Markdown
Member

@zalimeni zalimeni commented Oct 17, 2023

Manual backport of #3085, resolves #3086.

Note that Go 1.19 is now EOL, so for the final release of 1.0.x, we're moving to Go 1.20.

@zalimeni zalimeni added the pr/no-backport signals that a PR will not contain a backport label label Oct 17, 2023
@zalimeni
Copy link
Copy Markdown
Member Author

Attempting fix for unit tests via backport of recent fix: #3090

@zalimeni zalimeni changed the base branch from release/1.0.x to backport/1.0.x/dans/fix-enterprise-flakes October 17, 2023 01:50
@zalimeni zalimeni force-pushed the backport/zalimeni/net-5944-go-update-1.20.10/manual-1.0.x branch from 4ecacc5 to 2f6661b Compare October 17, 2023 01:51
Copy link
Copy Markdown
Contributor

@curtbushko curtbushko left a comment

Choose a reason for hiding this comment

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

The go update looks ok but is that ent unit test flaking?

@zalimeni
Copy link
Copy Markdown
Member Author

The go update looks ok but is that ent unit test flaking?

@curtbushko yep, it is. Once I noticed that, I opened #3090 expecting that backport to resolve it - assuming that works (that PR's tests are passing), will rebase here and look for a clean run.

Base automatically changed from backport/1.0.x/dans/fix-enterprise-flakes to release/1.0.x October 17, 2023 14:26
@zalimeni zalimeni force-pushed the backport/zalimeni/net-5944-go-update-1.20.10/manual-1.0.x branch from 2f6661b to dc956eb Compare October 17, 2023 14:28
@zalimeni zalimeni enabled auto-merge (squash) October 17, 2023 14:29
@zalimeni zalimeni merged commit b429710 into release/1.0.x Oct 17, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-5944-go-update-1.20.10/manual-1.0.x branch October 17, 2023 14:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport signals that a PR will not contain a backport label

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants