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] Adapt config.py to configuration file split #9432

Conversation

gabor-mezei-arm
Copy link
Contributor

@gabor-mezei-arm gabor-mezei-arm commented Jul 29, 2024

Description

Only update framework to the version used in #9229

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.

@gabor-mezei-arm gabor-mezei-arm added enhancement component-platform Portability layer and build scripts priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most) labels Jul 29, 2024
@gabor-mezei-arm gabor-mezei-arm self-assigned this Jul 29, 2024
@gabor-mezei-arm gabor-mezei-arm changed the base branch from development to mbedtls-3.6 July 29, 2024 11:26
@gabor-mezei-arm gabor-mezei-arm linked an issue Jul 29, 2024 that may be closed by this pull request
@ronald-cron-arm
Copy link
Contributor

@gabor-mezei-arm There is a conflict with the framework. Rebasing on top of the head of 3.6 should resolve the conflict.

Copy link
Contributor

@tom-daubney-arm tom-daubney-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.

Copy link
Contributor

@ronald-cron-arm ronald-cron-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

@ronald-cron-arm ronald-cron-arm added needs-work needs-ci Needs to pass CI tests labels Jul 30, 2024
@gabor-mezei-arm gabor-mezei-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-work needs-ci Needs to pass CI tests labels Jul 30, 2024
Copy link
Contributor

@tom-daubney-arm tom-daubney-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.

ronald-cron-arm
ronald-cron-arm previously approved these changes Aug 1, 2024
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
Copy link
Contributor

@ronald-cron-arm ronald-cron-arm left a comment

Choose a reason for hiding this comment

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

The update of the framework to the merge of #35 looks good to me.

@ronald-cron-arm
Copy link
Contributor

@tom-daubney-arm please have another look

Copy link
Contributor

@tom-daubney-arm tom-daubney-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.

@tom-daubney-arm tom-daubney-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, labels Aug 1, 2024
@ronald-cron-arm ronald-cron-arm added this pull request to the merge queue Aug 1, 2024
github-merge-queue bot pushed a commit that referenced this pull request Aug 1, 2024
[Backport 3.6] Adapt config.py to configuration file split
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 1, 2024
@ronald-cron-arm ronald-cron-arm added this pull request to the merge queue Aug 1, 2024
Merged via the queue into Mbed-TLS:mbedtls-3.6 with commit d289fa1 Aug 1, 2024
5 of 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 component-platform Portability layer and build scripts enhancement priority-high High priority - will be reviewed soon size-xs Estimated task size: extra small (a few hours at most)
Development

Successfully merging this pull request may close these issues.

Adapt config.py to configuration file split
3 participants