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

ci: rebase before running samples check #252

Open
wants to merge 1 commit into
base: msft-main
Choose a base branch
from

Conversation

Redent0r
Copy link

@Redent0r Redent0r commented Nov 14, 2024

Merge Checklist
  • Followed patch format from upstream recommendation: https://github.com/kata-containers/community/blob/main/CONTRIBUTING.md#patch-format
    • Included a single commit in a given PR - at least unless there are related commits and each makes sense as a change on its own.
  • Aware about the PR to be merged using "create a merge commit" rather than "squash and merge" (or similar)
  • The upstream/missing label (or upstream/not-needed) has been set on the PR.
Summary

This removes the need for PR author to rebase feature branch for updated samples in target branch, if any

Test Methodology

Look at Check policy samples check below

@Redent0r Redent0r requested review from a team as code owners November 14, 2024 21:06
@Redent0r Redent0r added the upstream/not-needed PRs that will not be upstreamed (e.g. internal) label Nov 14, 2024
@Redent0r Redent0r force-pushed the saulparedes/samples_check_rebase branch from 05213a3 to 452029d Compare November 14, 2024 21:12
@sprt
Copy link
Collaborator

sprt commented Nov 14, 2024

You should remove the recent sample fix from your feature branch to properly test this change.

This removes the need for PR author to rebase feature branch for updated samples in target branch, if any

Signed-off-by: Saul Paredes <[email protected]>
@Redent0r Redent0r force-pushed the saulparedes/samples_check_rebase branch from 452029d to 3ce4d08 Compare November 14, 2024 21:43
@Redent0r
Copy link
Author

Do not merge yet: For some reason it's failing to rebase despite not being an actual conflict

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
upstream/not-needed PRs that will not be upstreamed (e.g. internal)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants