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

[Backport 3.6] Add project and branch detection in shell #9764

Merged
merged 4 commits into from
Nov 27, 2024

Conversation

eleuzi01
Copy link
Contributor

@eleuzi01 eleuzi01 commented Nov 7, 2024

Description

Resolves Mbed-TLS/mbedtls-framework#39

PR checklist

@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 7, 2024
@eleuzi01 eleuzi01 force-pushed the issue-39-backport branch 6 times, most recently from 5220565 to d960434 Compare November 8, 2024 12:42
@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 needs-ci Needs to pass CI tests needs-work and removed needs-work needs-ci Needs to pass CI tests labels Nov 8, 2024
@eleuzi01 eleuzi01 force-pushed the issue-39-backport branch 3 times, most recently from 0317cb3 to 7025ad4 Compare November 18, 2024 15:54
@gilles-peskine-arm
Copy link
Contributor

Note that there's a merge conflict with #9766 which is urgent because its framework side has already been merged. Please wait until #9766 is merged. (Strangely the main PR doesn't appear to have a conflict.)

@eleuzi01 eleuzi01 removed needs-work needs-ci Needs to pass CI tests labels Nov 20, 2024
@eleuzi01 eleuzi01 added the needs-ci Needs to pass CI tests label Nov 25, 2024
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
Signed-off-by: Elena Uziunaite <elena.uziunaite@arm.com>
Copy link
Contributor

@mpg mpg 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 removed the needs-ci Needs to pass CI tests label Nov 27, 2024
Copy link
Contributor

@davidhorstmann-arm davidhorstmann-arm left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@davidhorstmann-arm davidhorstmann-arm added approved Design and code approved - may be waiting for CI or backports and removed 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 labels Nov 27, 2024
@davidhorstmann-arm davidhorstmann-arm added this pull request to the merge queue Nov 27, 2024
Merged via the queue into Mbed-TLS:mbedtls-3.6 with commit cbb5021 Nov 27, 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 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.

4 participants