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

Use a maintained action for "changed files" #7364

Merged
merged 1 commit into from
Nov 15, 2023

Conversation

vdemeester
Copy link
Member

@vdemeester vdemeester commented Nov 15, 2023

Changes

This is an alternative to #7360.

Closes #7360.

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Has Docs if any changes are user facing, including updates to minimum requirements e.g. Kubernetes version bumps
  • Has Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including functionality, content, code)
  • Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings). See some examples of good release notes.
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

NONE

@tekton-robot tekton-robot added the release-note-none Denotes a PR that doesnt merit a release note. label Nov 15, 2023
@tekton-robot tekton-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 15, 2023
@vdemeester
Copy link
Member Author

/kind misc

@tekton-robot tekton-robot added the kind/misc Categorizes issue or PR as a miscellaneuous one. label Nov 15, 2023
@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jerop

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 15, 2023
@vdemeester vdemeester force-pushed the fix-woke branch 2 times, most recently from d609a9b to 967f9ad Compare November 15, 2023 13:23
@tekton-robot tekton-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 15, 2023
@vdemeester
Copy link
Member Author

/hold

@tekton-robot tekton-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 15, 2023
@vdemeester vdemeester force-pushed the fix-woke branch 7 times, most recently from 277773c to b5a7a13 Compare November 15, 2023 13:46
@tekton-robot tekton-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 15, 2023
And replace "dummy" with "sample" in go tests to make `woke` happy :)

Signed-off-by: Vincent Demeester <vdemeest@redhat.com>
@vdemeester
Copy link
Member Author

/hold cancel

@tekton-robot tekton-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 15, 2023
@afrittoli
Copy link
Member

/lgtm

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Nov 15, 2023
@tekton-robot tekton-robot merged commit fd41253 into tektoncd:main Nov 15, 2023
13 checks passed
@vdemeester vdemeester deleted the fix-woke branch November 15, 2023 15:19
@JeromeJu
Copy link
Member

/cherry-pick release-v0.53.x
We would also need this for the cherry-pick PR to work on v0.53 to pass the 'woke' tests now.

@tekton-robot
Copy link
Collaborator

@JeromeJu: #7364 failed to apply on top of branch "release-v0.53.x":

Applying: Use a maintained action for "changed files"
.git/rebase-apply/patch:23: trailing whitespace.
        
warning: 1 line adds whitespace errors.
Using index info to reconstruct a base tree...
M	pkg/reconciler/taskrun/resources/taskref_test.go
M	pkg/reconciler/taskrun/taskrun_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/reconciler/taskrun/taskrun_test.go
Auto-merging pkg/reconciler/taskrun/resources/taskref_test.go
CONFLICT (content): Merge conflict in pkg/reconciler/taskrun/resources/taskref_test.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 Use a maintained action for "changed files"
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-v0.53.x
We would also need this for the cherry-pick PR to work on v0.53 to pass the 'woke' tests now.

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. 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/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

5 participants