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 #234 and #327 (and infra changes) to 1.1.x branch #459

Merged
merged 14 commits into from
May 13, 2022

Conversation

SethTisue
Copy link
Member

@SethTisue SethTisue commented May 13, 2022

specifically:

but also more broadly:

  • backports build/release infra to 1.1.x so we could actually perhaps release a 1.1.3

not clear yet if this will be for merge — I'm exploring the difficulty level

many of the changes I'm backporting here are of course not strictly necessary to backport, but they aren't harmful to backport either; the idea is to remove as many deltas between main and 1.1.x as reasonably possible, so that moving work back and forth between the branches will become easier again

Motivation

this is work for a client who wants to upgrade to 1.1.2 because it's the oldest version available for Scala 2.13; except that 1.1.2 includes #108 but doesn't include the followup PRs #234 and #327 which fixed #108's regressions, and those regressions are showing up in the client's own test suite

whereas by the time #234 and #237 landed, things had moved on and various 2.x changes were landing, including the removal of scala.util.parsing.json, which is still used here and there in minor ways by the client, so leaping all the way to some 2.x release would involve some cost/risk; stepwise upgrades are preferable when feasible

another possibility might be back to back-publish 1.1.1 for Scala 2.13, that wouldn't include #108 at all

It's noise. We did the same thing in the Scala standard library
sources a while ago.
@SethTisue SethTisue force-pushed the backport-pr234-and-pr27-to-1.1.x branch 2 times, most recently from eea325c to f4a504b Compare May 13, 2022 13:52
@SethTisue SethTisue changed the title [backport] backport #234 and #327 to 1.1.x branch backport #234 and #327 (and infra changes) to 1.1.x branch May 13, 2022
@SethTisue SethTisue force-pushed the backport-pr234-and-pr27-to-1.1.x branch from f4a504b to 51cdce5 Compare May 13, 2022 14:01
@SethTisue SethTisue force-pushed the backport-pr234-and-pr27-to-1.1.x branch from 51cdce5 to 0b6d77e Compare May 13, 2022 14:30
@SethTisue SethTisue marked this pull request as ready for review May 13, 2022 14:38
@SethTisue
Copy link
Member Author

I'm going to merge this — the 1.1.x branch is otherwise moribund, anyway, and there's nothing actually new here, it's all just backporting.

Then I'll see if I can roll a 1.1.3-RC1 using the backported publishing infra.

We can evaluate later whether we want to go to 1.1.3 final. In the meantime, if anyone wants to do some post-merge review on this, that would be entirely welcome!

@SethTisue SethTisue merged commit 3f35873 into scala:1.1.x May 13, 2022
@SethTisue SethTisue deleted the backport-pr234-and-pr27-to-1.1.x branch May 13, 2022 14:50
@SethTisue
Copy link
Member Author

see #460 for further work in this direction

@SethTisue SethTisue restored the backport-pr234-and-pr27-to-1.1.x branch August 10, 2022 20:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants