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

Bump golang to v1.21 (backport #684) #707

Merged
merged 2 commits into from
Apr 18, 2024
Merged

Bump golang to v1.21 (backport #684) #707

merged 2 commits into from
Apr 18, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Apr 17, 2024

Problem:
Go v1.20 is EOL on 06 Feb 2024.

Solution:
Bump golang to v1.21.

Related Issue:
harvester/harvester#5310, harvester/harvester#5612


This is an automatic backport of pull request #684 done by [Mergify](https://mergify.com).

Copy link
Author

mergify bot commented Apr 17, 2024

Cherry-pick of dd16a95 has failed:

On branch mergify/bp/v1.2/pr-684
Your branch is ahead of 'origin/v1.2' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit dd16a95.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pkg/config/coerce.go
	modified:   pkg/config/cos_test.go
	modified:   pkg/config/rename.go
	modified:   pkg/console/console.go
	modified:   pkg/console/dashboard_panels.go
	modified:   pkg/console/helper.go
	modified:   pkg/console/util_test.go
	modified:   pkg/console/webhooks_test.go
	modified:   pkg/util/disk.go
	modified:   pkg/util/disk_test.go
	modified:   pkg/widgets/dropdown.go
	modified:   pkg/widgets/select.go
	modified:   pkg/widgets/util.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   Dockerfile.dapper
	both modified:   pkg/console/install_panels.go
	both modified:   pkg/console/util.go
	deleted by us:   pkg/preflight/checks.go
	deleted by us:   pkg/preflight/checks_test.go
	both modified:   pkg/widgets/panel.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Apr 17, 2024
@mergify mergify bot mentioned this pull request Apr 17, 2024
@FrankYang0529 FrankYang0529 force-pushed the mergify/bp/v1.2/pr-684 branch from 40ce443 to cf7cb85 Compare April 17, 2024 03:18
votdev added 2 commits April 18, 2024 12:10
Signed-off-by: Volker Theile <[email protected]>
(cherry picked from commit c57dd35)
Signed-off-by: Volker Theile <[email protected]>
(cherry picked from commit dd16a95)
@FrankYang0529 FrankYang0529 force-pushed the mergify/bp/v1.2/pr-684 branch from 4a98b4e to 8e7899e Compare April 18, 2024 04:13
Copy link
Contributor

@Vicente-Cheng Vicente-Cheng 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!

@bk201 bk201 merged commit 8c30cf1 into v1.2 Apr 18, 2024
5 checks passed
@mergify mergify bot deleted the mergify/bp/v1.2/pr-684 branch April 18, 2024 05:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants