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-2.1] chore: remove usage of script to install golangci-lint #4368

Conversation

k8s-infra-cherrypick-robot

This is an automated cherry-pick of #4367

/assign richardcase

NONE

Signed-off-by: Richard Case <richard.case@outlook.com>
@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jun 30, 2023
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jun 30, 2023
@Ankitasw
Copy link
Member

Ankitasw commented Jul 3, 2023

/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 Jul 3, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Ankitasw

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 Jul 3, 2023
@k8s-ci-robot k8s-ci-robot merged commit 974b928 into kubernetes-sigs:release-2.1 Jul 3, 2023
@Ankitasw
Copy link
Member

/cherry-pick release-2.0

@k8s-infra-cherrypick-robot
Copy link
Author

@Ankitasw: #4368 failed to apply on top of branch "release-2.0":

Applying: chore: remove usage of script to install golanggi-lint
Using index info to reconstruct a base tree...
A	hack/ensure-golangci-lint.sh
M	hack/tools/Makefile
M	versions.mk
Falling back to patching base and 3-way merge...
Auto-merging versions.mk
CONFLICT (content): Merge conflict in versions.mk
Auto-merging hack/tools/Makefile
CONFLICT (content): Merge conflict in hack/tools/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 chore: remove usage of script to install golanggi-lint
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-2.0

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. needs-priority release-note-none Denotes a PR that doesn't merit a release note. 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.

4 participants