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

[ci] Bump golangci-lint for go 1.22 #2544

Merged
merged 1 commit into from
Feb 8, 2024

Conversation

mandre
Copy link
Contributor

@mandre mandre commented Feb 8, 2024

What this PR does / why we need it:

The test image was recently changed and now ships with go1.22rc2. We need to use a version of golangci-lint that is compatible with it.

Which issue this PR fixes(if applicable):
fixes #

Special notes for reviewers:
See explanation at #2537 (comment)

Release note:

NONE

The test image was recently changed and now ships with go1.22rc2. We
need to use a version of golangci-lint that is compatible with it.
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 8, 2024
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Feb 8, 2024
@mandre
Copy link
Contributor Author

mandre commented Feb 8, 2024

/cherry-pick release-1.28

@k8s-infra-cherrypick-robot

@mandre: once the present PR merges, I will cherry-pick it on top of release-1.28 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.28

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mandre
Copy link
Contributor Author

mandre commented Feb 8, 2024

/cherry-pick release-1.27

@k8s-infra-cherrypick-robot

@mandre: once the present PR merges, I will cherry-pick it on top of release-1.27 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.27

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mandre
Copy link
Contributor Author

mandre commented Feb 8, 2024

/cherry-pick release-1.26

@k8s-infra-cherrypick-robot

@mandre: once the present PR merges, I will cherry-pick it on top of release-1.26 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.26

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@dulek
Copy link
Contributor

dulek commented Feb 8, 2024

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 8, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dulek

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 8, 2024
@k8s-ci-robot k8s-ci-robot merged commit 6eda649 into kubernetes:master Feb 8, 2024
4 checks passed
@k8s-infra-cherrypick-robot

@mandre: new pull request created: #2545

In response to this:

/cherry-pick release-1.28

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot

@mandre: #2544 failed to apply on top of branch "release-1.27":

Applying: Bump golangci-lint for go 1.22
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump golangci-lint for go 1.22
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.27

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-infra-cherrypick-robot

@mandre: #2544 failed to apply on top of branch "release-1.26":

Applying: Bump golangci-lint for go 1.22
Using index info to reconstruct a base tree...
M	Makefile
Falling back to patching base and 3-way merge...
Auto-merging Makefile
CONFLICT (content): Merge conflict in Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Bump golangci-lint for go 1.22
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.26

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@mandre mandre deleted the bump-golangci-lint branch February 8, 2024 09:30
@mandre
Copy link
Contributor Author

mandre commented Feb 8, 2024

The automated cherry-picks for release-1.26 and release-1.27 failed because it used an older version of golangci-lint. Let's not bother about manual backports now, and let's see what version of go we have in the test images for those branches first, as there is a chance we don't need the backports.

@dulek
Copy link
Contributor

dulek commented Apr 2, 2024

/cherry-pick release-1.29

@k8s-infra-cherrypick-robot

@dulek: new pull request created: #2567

In response to this:

/cherry-pick release-1.29

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants