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

Move check_files.py to the framework #9800

Merged
merged 3 commits into from
Dec 20, 2024

Conversation

eleuzi01
Copy link
Contributor

@eleuzi01 eleuzi01 commented Nov 25, 2024

Description

Resolves Mbed-TLS/mbedtls-framework#72

PR checklist

Please remove the segment/s on either side of the | symbol as appropriate, and add any relevant link/s to the end of the line.
If the provided content is part of the present PR remove the # symbol.

Notes for the submitter

Please refer to the contributing guidelines, especially the
checklist for PR contributors.

Help make review efficient:

  • Multiple simple commits
    • please structure your PR into a series of small commits, each of which does one thing
  • Avoid force-push
    • please do not force-push to update your PR - just add new commit(s)
  • See our Guidelines for Contributors for more details about the review process.

@eleuzi01 eleuzi01 added enhancement needs-ci Needs to pass CI tests size-s Estimated task size: small (~2d) priority-high High priority - will be reviewed soon labels Nov 25, 2024
@eleuzi01 eleuzi01 force-pushed the issue-72-fw branch 5 times, most recently from 5e03a14 to 2c1e545 Compare November 29, 2024 16:28
@eleuzi01 eleuzi01 added the needs-backports Backports are missing or are pending review and approval. label Dec 5, 2024
@eleuzi01 eleuzi01 force-pushed the issue-72-fw branch 3 times, most recently from a6b283d to 218e336 Compare December 10, 2024 15:06
@eleuzi01 eleuzi01 added needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review and removed needs-ci Needs to pass CI tests labels Dec 11, 2024
@valeriosetti valeriosetti self-requested a review December 13, 2024 13:47
@valeriosetti
Copy link
Contributor

valeriosetti commented Dec 13, 2024

The conflict on framework is OK, but the one on tests/scripts/check_files.py is not. Perhaps this is due to the fact that this PR is cancelling that file from the main repo, while some other PR did some change to it? If that's the case, then I think a rebase is needed here,

Edit; I did git merge-base between your PR and development to find the branching point and then using that reference I run
git difftool -d e9d036ab1137465e5abd4675d7a663800be4bd2b..development -- tests/scripts/check_files.py
(the hash used here is the merge-base result). There seems to be indeed changes to that file after your branch was created.

@eleuzi01 eleuzi01 force-pushed the issue-72-fw branch 3 times, most recently from 657672e to 247a144 Compare December 13, 2024 14:52
valeriosetti
valeriosetti previously approved these changes Dec 16, 2024
minosgalanakis
minosgalanakis previously approved these changes Dec 18, 2024
Copy link
Contributor

@minosgalanakis minosgalanakis left a comment

Choose a reason for hiding this comment

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

LGTM

@eleuzi01 eleuzi01 dismissed stale reviews from minosgalanakis and valeriosetti via 2b49a83 December 19, 2024 08:42
@eleuzi01 eleuzi01 removed the needs-review Every commit must be reviewed by at least two team members, label Dec 19, 2024
@minosgalanakis minosgalanakis added needs-ci Needs to pass CI tests and removed needs-backports Backports are missing or are pending review and approval. labels Dec 19, 2024
Copy link
Contributor

@minosgalanakis minosgalanakis left a comment

Choose a reason for hiding this comment

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

LGTM

valeriosetti
valeriosetti previously approved these changes Dec 19, 2024
@eleuzi01 eleuzi01 added approved Design and code approved - may be waiting for CI or backports and removed needs-reviewer This PR needs someone to pick it up for review labels Dec 19, 2024
Copy link
Contributor

@minosgalanakis minosgalanakis left a comment

Choose a reason for hiding this comment

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

We need to update the framwork once more. Sorry

Signed-off-by: Elena Uziunaite <[email protected]>
Signed-off-by: Elena Uziunaite <[email protected]>
Signed-off-by: Elena Uziunaite <[email protected]>
Copy link
Contributor

@minosgalanakis minosgalanakis left a comment

Choose a reason for hiding this comment

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

Framework updated, waiting for CI

@minosgalanakis minosgalanakis added this pull request to the merge queue Dec 20, 2024
Merged via the queue into Mbed-TLS:development with commit 57e1375 Dec 20, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Design and code approved - may be waiting for CI or backports enhancement needs-ci Needs to pass CI tests priority-high High priority - will be reviewed soon size-s Estimated task size: small (~2d)
Development

Successfully merging this pull request may close these issues.

Move tests/scripts/check_files.py to the framework
3 participants