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 #85) #90

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

Copy link
Author

mergify bot commented Apr 17, 2024

Cherry-pick of 5dc08da has failed:
Updated

@mergify mergify bot added the conflicts label Apr 17, 2024
@mergify mergify bot mentioned this pull request Apr 17, 2024
@Vicente-Cheng Vicente-Cheng force-pushed the mergify/bp/v0.5.x/pr-85 branch from 9425637 to 189717a Compare April 17, 2024 03:30
dependabot bot and others added 5 commits April 17, 2024 11:43
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.14.0 to 0.17.0.
- [Commits](golang/crypto@v0.14.0...v0.17.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit a11b3da)
    - Also bump golangci-lint to v1.55.2

Signed-off-by: Vicente Cheng <[email protected]>
(cherry picked from commit 750c5d3)

Conflicts:
	Dockerfile.dapper
	  - update the golangci-lint version
Signed-off-by: Vicente Cheng <[email protected]>
(cherry picked from commit 1a06d92)
Signed-off-by: Volker Theile <[email protected]>
(cherry picked from commit 5dc08da)

Conflicts:
	go.mod
	pkg/controller/blockdevice/controller.go
          - remove redundant changes
Signed-off-by: Volker Theile <[email protected]>
(cherry picked from commit 55e8752)

Conflicts:
	Dockerfile.dapper
	  - update the golangci-lint version
@Vicente-Cheng
Copy link
Collaborator

v0.5.x missed some corresponding commits to bump
I added these back. Please help to check, thanks!

Copy link
Member

@FrankYang0529 FrankYang0529 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 0fd7869 into v0.5.x Apr 17, 2024
8 checks passed
@mergify mergify bot deleted the mergify/bp/v0.5.x/pr-85 branch April 17, 2024 09:17
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