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 #73) #74

Merged
merged 3 commits into from
Apr 17, 2024
Merged

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 #73 done by [Mergify](https://mergify.com).

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit f4ef139)

# Conflicts:
#	go.sum
Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit d154dc3)
@mergify mergify bot added the conflicts label Apr 17, 2024
Copy link
Author

mergify bot commented Apr 17, 2024

Cherry-pick of f4ef139 has failed:

On branch mergify/bp/v1.2/pr-73
Your branch is up to date with 'origin/v1.2'.

You are currently cherry-picking commit f4ef139.
  (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:   .golangci.json
	modified:   Dockerfile.dapper
	modified:   go.mod

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.sum

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 mentioned this pull request Apr 17, 2024
@ibrokethecloud ibrokethecloud merged commit 0c61d87 into v1.2 Apr 17, 2024
5 checks passed
@mergify mergify bot deleted the mergify/bp/v1.2/pr-73 branch April 17, 2024 01:47
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.

4 participants