scala3 icon indicating copy to clipboard operation
scala3 copied to clipboard

Backport "Support src filter in -WConf (Closes #17635) (#18783)"

Open mkurz opened this issue 10 months ago • 1 comments

Backports

  • #18783 (commit: 86e2fe5ee6d3431375f14de2563f6822f79c6bdc)

for next 3.3.4 release.

Besides import conflicts cherry-picking was smooth.

mkurz avatar Apr 29 '24 07:04 mkurz

Any chance someone looks at this PR or assign the 3.3.4 milestone? Thanks!

mkurz avatar May 15 '24 13:05 mkurz

Just chiming in to say that I think this would be highly beneficial to see merged for 3.3.4. Beneficial in general, but also specifically for our needs at Lightbend. (And of course @mkurz represents Play, obviously important users of Scala.)

There doesn't seem to be a 3.3.4 milestone I can assign. I'll take the liberty — which I try not to take too often! — of mentioning @Gedochao and @Kordyjan because I'd like to understand what the intended workflow is here. Like, is the target branch being release-3.3.4 sufficient for the PR to be noticed when 3.3.4 is put together? Or is there some label I could apply in a case like this? I thought about "backport:nominated" but it doesn't seem exactly apropos since this PR actually is a backport 😄

SethTisue avatar May 27 '24 15:05 SethTisue

There was some discussion at core meeting today about LTS backports (cc @sjrd, who raised it). Some points:

  1. The team is aware there is a lack of public documentation about the intended workflow and they aim to improve it (but I'm not sure when, and @Kordyjan is currently less available than usual).
  2. The workflow involves mass backporting of many PRs at once, in chronological order to help keep the merge conflict situation from becoming unwieldy.
  3. Therefore, individual backport PRs like this one are (though obviously well intentioned, of course — thank you!) aren't as helpful as one might think and probably won't be merged.

SethTisue avatar May 29 '24 14:05 SethTisue

Therefore, individual backport PRs like this one are (though obviously well intentioned, of course — thank you!) aren't as helpful as one might think and probably won't be merged.

Is there some way to mark a PR as a backport candidate?

joroKr21 avatar Jun 03 '24 07:06 joroKr21

All PRs are automatically backport candidates. ;)

sjrd avatar Jun 03 '24 07:06 sjrd

even taking in account

Therefore, individual backport PRs like this one are (though obviously well intentioned, of course — thank you!) aren't as helpful as one might think and probably won't be merged.

Shouldn't this be targeting lts-3.3 branch ?

maslovalex avatar Jul 03 '24 13:07 maslovalex

Thank you for your efforts in backporting this to the LTS. However, we've decided to go with alternative backport in https://github.com/scala/scala3/pull/21087 - our procedure is mostly based on dedicated project and scripts used to ease decisions and cherry-picks into the LTS. One of dependencies of backported changes #18503 was not previously backported to the LTS (to be decided if change in semantics is acceptable on the next core meeting) which lead to failures in the CI. I've decided it would be easier to resolve conflicts (especially after rebase from invalid branch release-3.3.4 to lts-3.3) in a fresh branch.

WojciechMazur avatar Jul 06 '24 21:07 WojciechMazur