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

[release-1.23] test: upgrade golangci/golangci-lint-action to v1.54 #1175

Conversation

k8s-infra-cherrypick-robot

This is an automated cherry-pick of #1119

/assign andyzhangx

none

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Dec 14, 2023
@k8s-ci-robot k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Dec 14, 2023
Copy link
Member

@andyzhangx andyzhangx left a comment

Choose a reason for hiding this comment

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

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, k8s-infra-cherrypick-robot

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 Dec 14, 2023
@k8s-ci-robot
Copy link
Contributor

@k8s-infra-cherrypick-robot: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-blob-csi-driver-external-e2e-nfs 79c826e link true /test pull-blob-csi-driver-external-e2e-nfs

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@andyzhangx andyzhangx merged commit 82bb058 into kubernetes-sigs:release-1.23 Dec 15, 2023
20 of 22 checks passed
@andyzhangx
Copy link
Member

/cherrypick release-1.22

@k8s-infra-cherrypick-robot
Copy link
Author

@andyzhangx: #1175 failed to apply on top of branch "release-1.22":

Applying: upgrade golangci/golangci-lint-action to v1.54
Using index info to reconstruct a base tree...
M	pkg/blob/controllerserver.go
M	pkg/blob/controllerserver_test.go
M	pkg/blobfuse-proxy/server/server.go
M	pkg/blobplugin/main.go
M	pkg/csi-common/driver_test.go
M	pkg/util/util.go
M	pkg/util/util_test.go
M	test/e2e/testsuites/specs.go
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/testsuites/specs.go
Auto-merging pkg/util/util_test.go
CONFLICT (content): Merge conflict in pkg/util/util_test.go
Auto-merging pkg/util/util.go
CONFLICT (content): Merge conflict in pkg/util/util.go
Auto-merging pkg/csi-common/driver_test.go
Auto-merging pkg/blobplugin/main.go
Auto-merging pkg/blobfuse-proxy/server/server.go
Auto-merging pkg/blob/controllerserver_test.go
CONFLICT (content): Merge conflict in pkg/blob/controllerserver_test.go
Auto-merging pkg/blob/controllerserver.go
CONFLICT (content): Merge conflict in pkg/blob/controllerserver.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 upgrade golangci/golangci-lint-action to v1.54
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:

/cherrypick release-1.22

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. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants