Skip to content

Fix golangci-lint action step for large diff#3157

Merged
tekton-robot merged 1 commit intotektoncd:mainfrom
jkhelil:fix_golangci_large_diff
Jan 13, 2026
Merged

Fix golangci-lint action step for large diff#3157
tekton-robot merged 1 commit intotektoncd:mainfrom
jkhelil:fix_golangci_large_diff

Conversation

@jkhelil
Copy link
Member

@jkhelil jkhelil commented Jan 13, 2026

Changes

Submitter Checklist

These are the criteria that every PR should meet, please check them off as you
review them:

See the contribution guide for more details.

Release Notes

NONE

@tekton-robot tekton-robot added the release-note-none Denotes a PR that doesnt merit a release note. label Jan 13, 2026
@tekton-robot tekton-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 13, 2026
@jkhelil jkhelil force-pushed the fix_golangci_large_diff branch from 9baeb08 to e64c68d Compare January 13, 2026 11:32
@anithapriyanatarajan
Copy link
Contributor

anithapriyanatarajan commented Jan 13, 2026

/kind misc

@tekton-robot tekton-robot added the kind/misc Categorizes issue or PR as a miscellaneuous one. label Jan 13, 2026
@anithapriyanatarajan
Copy link
Contributor

anithapriyanatarajan commented Jan 13, 2026

/approve

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 13, 2026
vdemeester
vdemeester approved these changes Jan 13, 2026
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 13, 2026
@tekton-robot
Copy link
Contributor

tekton-robot commented Jan 13, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: anithapriyanatarajan, vdemeester

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [anithapriyanatarajan,vdemeester]

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

@mbpavan
Copy link
Contributor

mbpavan commented Jan 13, 2026

/retest

@mbpavan
Copy link
Contributor

mbpavan commented Jan 13, 2026

/lgtm

@tekton-robot tekton-robot merged commit 39d4c50 into tektoncd:main Jan 13, 2026
20 of 21 checks passed
@jkhelil
Copy link
Member Author

jkhelil commented Jan 13, 2026

/cherry-pick release-v0.71.x

@tekton-robot
Copy link
Contributor

tekton-robot commented Jan 13, 2026

❌ Cherry-pick to release-v0.71.x failed!

The automatic cherry-pick to release-v0.71.x failed.

Output:

🤖 Starting cherry-pick process...
Fetching PR #3157 information...
Found merge commit: 39d4c50df04ec674c08932c457a954479ec45b5e
PR title: Fix golangci-lint action step for large diff
Fetching target branch: release-v0.71.x...
From https://github.com/tektoncd/operator
 * branch                release-v0.71.x -> FETCH_HEAD
Checking for existing cherry-pick PR...
Creating cherry-pick branch: cherry-pick-3157-to-release-v0.71.x...
Switched to a new branch 'cherry-pick-3157-to-release-v0.71.x'
branch 'cherry-pick-3157-to-release-v0.71.x' set up to track 'origin/release-v0.71.x'.
Cherry-picking commit 39d4c50df04ec674c08932c457a954479ec45b5e...
CONFLICT (modify/delete): .github/workflows/ci.yaml deleted in HEAD and modified in 39d4c50df (Fix golangci-lint action step for large diff).  Version 39d4c50df (Fix golangci-lint action step for large diff) of .github/workflows/ci.yaml left in tree.
error: could not apply 39d4c50df... Fix golangci-lint action step for large diff
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
❌ ERROR: Cherry-pick failed due to conflicts or other errors.

Next steps:

  • Check the action logs for complete details
  • If the PR is not merged, merge it first and try again
  • If there are conflicts, you'll need to manually cherry-pick this PR

@anithapriyanatarajan
Copy link
Contributor

anithapriyanatarajan commented Jan 13, 2026

/cherry-pick release-v0.71.x

@tekton-robot
Copy link
Contributor

tekton-robot commented Jan 13, 2026

❌ Cherry-pick to release-v0.71.x failed!

The automatic cherry-pick to release-v0.71.x failed.

Output:

🤖 Starting cherry-pick process...
Fetching PR #3157 information...
Found merge commit: 39d4c50df04ec674c08932c457a954479ec45b5e
PR title: Fix golangci-lint action step for large diff
Fetching target branch: release-v0.71.x...
From https://github.com/tektoncd/operator
 * branch                release-v0.71.x -> FETCH_HEAD
Checking for existing cherry-pick PR...
Creating cherry-pick branch: cherry-pick-3157-to-release-v0.71.x...
Switched to a new branch 'cherry-pick-3157-to-release-v0.71.x'
branch 'cherry-pick-3157-to-release-v0.71.x' set up to track 'origin/release-v0.71.x'.
Cherry-picking commit 39d4c50df04ec674c08932c457a954479ec45b5e...
CONFLICT (modify/delete): .github/workflows/ci.yaml deleted in HEAD and modified in 39d4c50df (Fix golangci-lint action step for large diff).  Version 39d4c50df (Fix golangci-lint action step for large diff) of .github/workflows/ci.yaml left in tree.
error: could not apply 39d4c50df... Fix golangci-lint action step for large diff
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
❌ ERROR: Cherry-pick failed due to conflicts or other errors.

Next steps:

  • Check the action logs for complete details
  • If the PR is not merged, merge it first and try again
  • If there are conflicts, you'll need to manually cherry-pick this PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vdemeester vdemeester vdemeester approved these changes

@piyush-garg piyush-garg Awaiting requested review from piyush-garg

@PuneetPunamiya PuneetPunamiya Awaiting requested review from PuneetPunamiya

Assignees

@vdemeester vdemeester

@mbpavan mbpavan

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesnt merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@jkhelil @anithapriyanatarajan @tekton-robot @mbpavan @vdemeester