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

tes: fix golint action failure #1200

Merged
merged 4 commits into from
Mar 5, 2023
Merged

tes: fix golint action failure #1200

merged 4 commits into from
Mar 5, 2023

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind failing-test

What this PR does / why we need it:
tes: fix golint action failure

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 4, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

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 Mar 4, 2023
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 4, 2023
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 95d8f00 into master Mar 5, 2023
@andyzhangx
Copy link
Member Author

/cherrypick release-1.26

@k8s-infra-cherrypick-robot

@andyzhangx: #1200 failed to apply on top of branch "release-1.26":

Applying: tes: fix golint action failure
Applying: chore: set go1.19 in go.mod
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
Auto-merging go.mod
Applying: chore: fix golint errors
Using index info to reconstruct a base tree...
A	pkg/os/smb/smb.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): pkg/os/smb/smb.go deleted in HEAD and modified in chore: fix golint errors. Version chore: fix golint errors of pkg/os/smb/smb.go left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0003 chore: fix golint errors
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.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.

@andyzhangx andyzhangx deleted the fix-golint2 branch April 4, 2023 10:16
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. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants