Request for a new vue3 branch in webui-vue
webui-vue currently uses Vue 2, which has reached end-of-life. The migration to Vue 3 is complex and requires breaking changes. To help move along this work, a new branch, which will temporarily have errors, is desired. This was discussed in Discord[1] and in the GUI workgroup meeting[2].
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
A version of this commit, https://gerrit.openbmc.org/c/openbmc/webui-vue/+/55438, upgrading the packages to Vue 3, is expected to be the first commit to go into this new branch. Future commits handling Bootstrap, etc., will follow.
[1]: https://discord.com/channels/775381525260664832/776550056391606352/1245423441935339560
[2]: https://github.com/openbmc/openbmc/wiki/GUI-Design-work-group
Thanks,
Gunnar
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it to appear on github as a rewrite of the "master" branch and we absolutely need to at least keep the vue2 code in some branch so that it doesn't get pruned from the github history. If we don't do this, it will become impossible for people to build older OpenBMC releases.
I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
to point at it.
b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.
Signature · 1 line
Patrick Williams
Quoted 10 lines · Patrick Williams
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it to appear on github as a rewrite of the "master" branch and we absolutely need to at least keep the vue2 code in some branch so that it doesn't get pruned from the github history. If we don't do this, it will become impossible for people to build older OpenBMC releases.
Quoted 7 lines
I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
to point at it.b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.
My expectation was that this branch continues to rebase in patches, and once ready to merge, we would just rebase the series on top of master before pushing it so there's no discontinuity, no merge commit, and autobump would just pick it up.
Quoted 3 lines
--
Patrick Williams
Quoted 16 lines · Ed Tanous
Quoted 15 lines · Patrick Williams
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it to appear on github as a rewrite of the "master" branch and we absolutely need to at least keep the vue2 code in some branch so that it doesn't get pruned from the github history. If we don't do this, it will become impossible for people to build older OpenBMC releases.
I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
to point at it.
Quoted 8 lines
Quoted 2 lines
b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.My expectation was that this branch continues to rebase in patches, and once ready to merge, we would just rebase the series on top of master before pushing it so there's no discontinuity, no merge commit, and autobump would just pick it up.
We would have to give "Kiran and his team" permissions in Gerrit to force-push to the "vue3" branch in order to facilitate these rebases. It also means potentially unreviewed content ends up in the branch due to this permission.
I'm okay with going this route but wanted to make sure everyone is aware of the implications.
Signature · 1 line
Patrick Williams
Quoted 22 lines · Patrick Williams
Quoted 20 lines · Ed Tanous
Quoted 17 lines · Patrick Williams
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it to appear on github as a rewrite of the "master" branch and we absolutely need to at least keep the vue2 code in some branch so that it doesn't get pruned from the github history. If we don't do this, it will become impossible for people to build older OpenBMC releases.
I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
to point at it.b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.
Quoted 7 lines
Quoted 4 lines
My expectation was that this branch continues to rebase in patches, and once ready to merge, we would just rebase the series on top of master before pushing it so there's no discontinuity, no merge commit, and autobump would just pick it up.
We would have to give "Kiran and his team" permissions in Gerrit to force-push to the "vue3" branch in order to facilitate these rebases.
Sorry, I should've said "My expectation was that this branch continues to cherry-pick in patches"
There'd only be one rebase and push (not force I think?), right at the end, and I'm happy to do the final merge if that solves the permissions problem. I suspect even if we had to reopen a sensibly-squashed gerrit series for re-review after we thought the bugs were solved, that might be reasonable, although it's hard to know based on what's in there.
Quoted 8 lines
It also means potentially unreviewed content ends up in the branch due to this permission.
I'm okay with going this route but wanted to make sure everyone is aware of the implications.
--
Patrick Williams
Quoted 28 lines · Ed Tanous
Quoted 27 lines · Patrick Williams
Quoted 24 lines · Ed Tanous
Quoted 10 lines · Patrick Williams
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it to appear on github as a rewrite of the "master" branch and we absolutely need to at least keep the vue2 code in some branch so that it doesn't get pruned from the github history. If we don't do this, it will become impossible for people to build older OpenBMC releases.
Quoted 7 lines
I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
to point at it.b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.My expectation was that this branch continues to rebase in patches, and once ready to merge, we would just rebase the series on top of master before pushing it so there's no discontinuity, no merge commit, and autobump would just pick it up.
Quoted 8 lines
Quoted 2 lines
We would have to give "Kiran and his team" permissions in Gerrit to force-push to the "vue3" branch in order to facilitate these rebases.
Sorry, I should've said "My expectation was that this branch continues to cherry-pick in patches"
There'd only be one rebase and push (not force I think?), right at the end,
You don't have to rebase either. Another option is to use git merge -s ours to join the branch histories but set the tree state in favour of one side.
I have been doing this with our qemu fork:
https://amboar.github.io/notes/2021/09/16/history-preserving-fork-maintenance-with-git.html
Andrew
Quoted 39 lines · MDT Andrew Jeffery
Quoted 34 lines · Ed Tanous
Quoted 22 lines · Patrick Williams
Quoted 20 lines · Ed Tanous
Quoted 17 lines · Patrick Williams
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it to appear on github as a rewrite of the "master" branch and we absolutely need to at least keep the vue2 code in some branch so that it doesn't get pruned from the github history. If we don't do this, it will become impossible for people to build older OpenBMC releases.
I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
to point at it.b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.Quoted 7 lines
Quoted 4 lines
My expectation was that this branch continues to rebase in patches, and once ready to merge, we would just rebase the series on top of master before pushing it so there's no discontinuity, no merge commit, and autobump would just pick it up.
We would have to give "Kiran and his team" permissions in Gerrit to force-push to the "vue3" branch in order to facilitate these rebases.
Sorry, I should've said "My expectation was that this branch continues to cherry-pick in patches"
Quoted 7 lines
Quoted 2 lines
There'd only be one rebase and push (not force I think?), right at the end,
You don't have to rebase either. Another option is to use
git merge -s oursto join the branch histories but set the tree state in favour of one side.
Does git merge -s ours work? And then go with a new vue3 branch?
If not, I am okay with using this as an opportunity to migrate from 'master' to 'main'. It is just a bit unexpected. If we go that route, we can add some temporary documentation.
I was thinking Kiran and team would cherry-pick patches merged to 'master' and push them to the 'vue3' branch, leaving the original author's signed-off, etc. I wasn't thinking any special permissions would be needed until "merging" the branches at the end.
Thanks,
Gunnar
Hi All,
Agree on latest @Gunnar M comments. So shall we process vue3 branch creation further if no other concerns.
Regards,
Kiran.
-----Original Message-----
From: Gunnar M <[email protected]>
Sent: Thursday, July 4, 2024 2:04 AM
To: Andrew Jeffery <[email protected]>; Ed Tanous <[email protected]>; Patrick Williams <[email protected]>
Cc: Kiran Kumar B <[email protected]>; [email protected]; [email protected]; [email protected]; Sivaprabu G <[email protected]>
Subject: [EXTERNAL] Re: Request for a new vue3 branch in webui-vue
**CAUTION: The e-mail below is from an external source. Please exercise caution before opening attachments, clicking links, or following guidance.**
Quoted 38 lines · MDT Andrew Jeffery
Quoted 34 lines · Ed Tanous
Quoted 22 lines · Patrick Williams
Quoted 20 lines · Ed Tanous
Quoted 17 lines · Patrick Williams
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it
to appear on github as a rewrite of the "master" branch and we absolutely need to at least keep the vue2 code in some branch
so that it doesn't get pruned from the github history. If we
don't do this, it will become impossible for people to build older OpenBMC releases.I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
to point at it.b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.Quoted 7 lines
Quoted 4 lines
My expectation was that this branch continues to rebase in patches, and once ready to merge, we would just rebase the series on top of master before pushing it so there's no discontinuity, no merge commit, and autobump would just pick it up.
We would have to give "Kiran and his team" permissions in Gerrit to force-push to the "vue3" branch in order to facilitate these rebases.
Sorry, I should've said "My expectation was that this branch continues to cherry-pick in patches"
Quoted 7 lines
Quoted 2 lines
There'd only be one rebase and push (not force I think?), right at the end,
You don't have to rebase either. Another option is to use
git merge -s oursto join the branch histories but set the tree state in favour of one side.
Does git merge -s ours work? And then go with a new vue3 branch?
If not, I am okay with using this as an opportunity to migrate from 'master' to 'main'. It is just a bit unexpected. If we go that route, we can add some temporary documentation.
I was thinking Kiran and team would cherry-pick patches merged to 'master' and push them to the 'vue3' branch, leaving the original author's signed-off, etc. I wasn't thinking any special permissions would be needed until "merging" the branches at the end.
Thanks,
Gunnar
-The information contained in this message may be confidential and proprietary to American Megatrends (AMI). This communication is intended to be read only by the individual or entity to whom it is addressed or by their designee. If the reader of this message is not the intended recipient, you are on notice that any distribution of this message, in any form, is strictly prohibited. Please promptly notify the sender by reply e-mail or by telephone at 770-246-8600, and then delete or destroy all copies of the transmission.
Hi @Gunnar M<mailto:[email protected]> @Patrick Williams<mailto:[email protected]>
Thanks for creating vue3 branch.
https://github.com/openbmc/webui-vue/tree/vue3
@Ed Tanous<mailto:[email protected]>
https://github.com/openbmc/webui-vue/compare/master...vue3
As per understanding, above link having latest master copy and changes of https://gerrit.openbmc.org/c/openbmc/webui-vue/+/55438 ? is that correct ?
https://gerrit.openbmc.org/q/project:openbmc/webui-vue+branch:vue3+status:open
[cid:[email protected]]
We saw that all above 4 PR’s has been rebased with vue3 branch and will be merged with vue3 branch as per review process +2 ? is that correct ?
In future, Our upcoming PR’s will be raised against the vue3 branch.
My team action item :
1. Rebasing changes from Master to vue3 branch by 2 weeks once. For ex: https://gerrit.openbmc.org/c/openbmc/webui-vue/+/72867/1
@Gunnar M<mailto:[email protected]> @Ed Tanous<mailto:[email protected]>
Let’s add one section as part of REDME file to highlight the ongoing vue3 work activities in detailed manner which will notify all so that if any community member interested, then they can raise PRs in both branches to sync.
[cid:[email protected]]
Regards,
Kiran.
-----Original Message-----
From: Kiran Kumar B
Sent: Thursday, July 11, 2024 10:15 AM
To: Gunnar M <[email protected]>; Andrew Jeffery <[email protected]>; Ed Tanous <[email protected]>; Patrick Williams <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Sivaprabu G <[email protected]>
Subject: RE: [EXTERNAL] Re: Request for a new vue3 branch in webui-vue
Hi All,
Agree on latest @Gunnar M comments. So shall we process vue3 branch creation further if no other concerns.
Regards,
Kiran.
-----Original Message-----
From: Gunnar M <[email protected]<mailto:[email protected]>>
Sent: Thursday, July 4, 2024 2:04 AM
To: Andrew Jeffery <[email protected]<mailto:[email protected]>>; Ed Tanous <[email protected]<mailto:[email protected]>>; Patrick Williams <[email protected]<mailto:[email protected]>>
Subject: [EXTERNAL] Re: Request for a new vue3 branch in webui-vue
**CAUTION: The e-mail below is from an external source. Please exercise caution before opening attachments, clicking links, or following guidance.**
Quoted 82 lines · On 06/26/2024 7:06 PM MDT Andrew Jeffery…
Quoted 64 lines · Ed Tanous
Quoted 50 lines · On Wed, Jun 26, 2024 at 3:10 PM Patrick Williams…
Quoted 45 lines · Ed Tanous
Quoted 26 lines · On Wed, Jun 26, 2024 at 2:40 PM Patrick Williams…
Quoted 1 line · Gunnar M
Kiran and his team have volunteered to sync patches merged to master to this new 'vue3' branch bi-weekly. Thank you, Kiran! When the migration to Vue 3 is complete, and all commits are synced over, this 'vue3' branch will become the 'master' branch.
We need to be careful about how we do this. You don't want it
to appear on github as a rewrite of the "master" branch and we
absolutely need to at least keep the vue2 code in some branch
so that it doesn't get pruned from the github history. If we
don't do this, it will become impossible for people to build older OpenBMC releases.
I would suggest either:
a. We do the opposite: create a 'vue2' branch and update the recipe
Quoted 7 lines
to point at it.
b. We use this as an opportunity to migrate from 'master' to 'main'
and use 'main' as the vue3 branch.
My expectation was that this branch continues to rebase in
patches, and once ready to merge, we would just rebase the
series on top of master before pushing it so there's no
Quoted 7 lines
Quoted 1 line
discontinuity, no merge commit, and autobump would just pick it up.
We would have to give "Kiran and his team" permissions in Gerrit
to force-push to the "vue3" branch in order to facilitate these rebases.
Sorry, I should've said "My expectation was that this branch
Quoted 7 lines
continues to cherry-pick in patches"
There'd only be one rebase and push (not force I think?), right at
the end,
Quoted 7 lines
You don't have to rebase either. Another option is to use `git merge
-s ours` to join the branch histories but set the tree state in favour
of one side.
Does git merge -s ours work? And then go with a new vue3 branch?
If not, I am okay with using this as an opportunity to migrate from 'master' to 'main'. It is just a bit unexpected. If we go that route, we can add some temporary documentation.
I was thinking Kiran and team would cherry-pick patches merged to 'master' and push them to the 'vue3' branch, leaving the original author's signed-off, etc. I wasn't thinking any special permissions would be needed until "merging" the branches at the end.
Thanks,
Gunnar
-The information contained in this message may be confidential and proprietary to American Megatrends (AMI). This communication is intended to be read only by the individual or entity to whom it is addressed or by their designee. If the reader of this message is not the intended recipient, you are on notice that any distribution of this message, in any form, is strictly prohibited. Please promptly notify the sender by reply e-mail or by telephone at 770-246-8600, and then delete or destroy all copies of the transmission.