#Late PRs

1 messages · Page 1 of 1 (latest)

covert wyvern
#

I think generally everything is done once the release is out

#

(which was quite early today)

frail shuttle
#

You need to tag them for 2026.4 on next branch or just put them against current branch.

#

But I'm not sure who's cherry-picking those late PR's here.

cyan ingot
#

Yeah, this makes sense. Can you switch the targeted branch in a PR?

frail shuttle
#

You need to rebase everytime you switch from next to current and the other way around

cyan ingot
#

Gotcha. I mean - is the change (and rebase) clickable in the UI or would they have to make a new PR targeting the other branch?

#

For those that I merged, I'll create a cherrypick PR

frail shuttle
#

You don't need to create a cherry-pick for those who are tagged, that's done automatically.

cyan ingot
#

Even if I added the milestone after the stable release?

frail shuttle
#

No, it's not really clickable through the UI, you can change the branch where it merges to, but the commits are still attached to what it was.

#

It's easier to just recreate the pull request onto the other branch

#

These that are tagged for milestone are cherry-picked automatically, as in somebody runs a script that automatically cherry-picks those pull requests in the milestone. When that's done, the pull requests get a cherry-picked tag so they are not cherry-picked again the next time.

#

But I don't know where that script exists.

cyan ingot
#

automatically, as in somebody runs a script that automatically cherry-picks
so, semi-automatically 😅
thanks!

frail shuttle
#

For example, in frontend it looks like this:

image.png
#

Next time somebody makes a release, these 3 without cherry-picked will be cherry-picked and tagged

cyan ingot
#

Got it, thanks for explaining!

hearty flare
#

I have picked everything as far as I'm aware

#

let me double check

#

are missed

#

Will pick those up before closing the milestone

#

That one isn't in the 2024.6 release

cyan ingot
#

oops, my bad

hearty flare
#

So that means everything was correctly picked and everything made it in final

cyan ingot
#

tep, these are the two I merged and tagged today

hearty flare
#

Closed the milestone

#

will sync back current into next right away

#

oh I can't... my dev env is down still (just had a power outage)

cyan ingot
hearty flare
#

That one is in 2026.5; so that is fine

cyan ingot
#

Right, the related PR was merged 1h ago. Thanks!

hearty flare
#

Yup, after the "beta has been cut message" (week ago), only PRs merged upstream (in e.g, core) tagged on the release milestone are going into the current running beta / upcoming release still

#

if the upstream PR doesn't have that set, it will be the next release (it missed the beta cut at that point)

cyan ingot
#

ah, gotcha, I missed that, so similar to the docs repo

hearty flare
#

Yes, all across the board is cut at that point

#

as in, it is a harmony between all parts 🙂

#

Talking about branches and targets

#

I think your triggers/conditions docs PR can target "current" as well

#

It would be relevant today already for users

frail shuttle
#

Do you do cherry-picks on documentation pr's after stable release just like frontend or core?

cyan ingot
#

omg, you can change the target branch on a PR, but you have to Edit title 🙈

image.png
frail shuttle
#

That was what I'm saying before

cyan ingot
#

yeah, I had a feeling this should be possible, but I couldn't find a button

frail shuttle
#

Just note, when you change next to current, it will take all commits that are not on current yet, that will be more than just your commit

cyan ingot
#

I know, ask me how 🙈
I'll rebase it locally

hearty flare
cyan ingot
hearty flare
#

I've synced current -> next -> rc

#

So all stars are aligned again