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.

Sign up for GitHub

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

Jump to bottom

[Backport 3.6] Update framework submodule to point to main #9795

Closed
wants to merge 1 commit into from
Closed

[Backport 3.6] Update framework submodule to point to main #9795

wants to merge 1 commit into from

Conversation

davidhorstmann-arm
Copy link
Contributor

No actual changes, just moving the framework pointer to be the tip of main rather than the tip of a feature branch per the merge of #9766.

This will reduce conflicts in future PRs that update the framework submodule.

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.

  • changelog not required because: No user-facing changes
  • development PR provided Update framework submodule to point to main #9794
  • framework PR not required
  • 3.6 PR here
  • 2.28 PR not required because: No submodule in 2.28
  • tests not required because: No actual changes

@davidhorstmann-arm davidhorstmann-arm mentioned this pull request Nov 21, 2024
Merged
5 tasks
@davidhorstmann-arm davidhorstmann-arm changed the title Update framework submodule to point to main [Backport 3.6] Update framework submodule to point to main Nov 21, 2024
@davidhorstmann-arm davidhorstmann-arm added needs-review Every commit must be reviewed by at least two team members, needs-ci Needs to pass CI tests needs-reviewer This PR needs someone to pick it up for review size-xs Estimated task size: extra small (a few hours at most) labels Nov 21, 2024
eleuzi01
eleuzi01 previously approved these changes Nov 21, 2024
View reviewed changes
mpg
mpg previously approved these changes Nov 21, 2024
View reviewed changes
@mpg mpg 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 21, 2024
@mpg mpg enabled auto-merge November 21, 2024 11:53
@ronald-cron-arm
Copy link
Contributor

After the merge of #9787, this should be updated with the merge of #79. Sorry about that. @davidhorstmann-arm do you do it? I can do it otherwise.

@davidhorstmann-arm
Copy link
Contributor Author

Solved in #9771, thanks @ronald-cron-arm

auto-merge was automatically disabled November 21, 2024 14:57

Pull request was closed

@davidhorstmann-arm
Copy link
Contributor Author

Actually no that can't be right as that is in development not 3.6

@davidhorstmann-arm davidhorstmann-arm dismissed stale reviews from mpg and eleuzi01 via fa3ed79 November 21, 2024 15:00
@davidhorstmann-arm davidhorstmann-arm force-pushed the test-helpers-update-framework-submodule-3.6 branch from c5aa662 to fa3ed79 Compare November 21, 2024 15:00
eleuzi01
eleuzi01 previously approved these changes Nov 21, 2024
View reviewed changes
@davidhorstmann-arm davidhorstmann-arm force-pushed the test-helpers-update-framework-submodule-3.6 branch from fa3ed79 to 5b7465c Compare November 21, 2024 15:33
@davidhorstmann-arm davidhorstmann-arm added needs-review Every commit must be reviewed by at least two team members, needs-work and removed approved Design and code approved - may be waiting for CI or backports needs-review Every commit must be reviewed by at least two team members, labels Nov 21, 2024
@davidhorstmann-arm
Update framework submodule to point to main
d689c8d 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
@davidhorstmann-arm davidhorstmann-arm force-pushed the test-helpers-update-framework-submodule-3.6 branch from 5b7465c to d689c8d Compare November 21, 2024 15:35
@davidhorstmann-arm davidhorstmann-arm added needs-review Every commit must be reviewed by at least two team members, and removed needs-work labels Nov 21, 2024
@eleuzi01 eleuzi01 removed the needs-ci Needs to pass CI tests label Nov 27, 2024
@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, labels Nov 27, 2024
@davidhorstmann-arm davidhorstmann-arm added this pull request to the merge queue Nov 27, 2024
@davidhorstmann-arm davidhorstmann-arm removed this pull request from the merge queue due to a manual request Nov 27, 2024
@davidhorstmann-arm
Copy link
Contributor Author

Removed from the queue, I think this may conflict with #9764

@gilles-peskine-arm
Copy link
Contributor

Superseded by #9805

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eleuzi01 eleuzi01 eleuzi01 approved these changes

@mpg mpg mpg approved these changes

Assignees
No one assigned
Labels
approved Design and code approved - may be waiting for CI or backports size-xs Estimated task size: extra small (a few hours at most)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@davidhorstmann-arm @ronald-cron-arm @gilles-peskine-arm @mpg @eleuzi01