merge 2.12 to 2.13 20230405 [ci: last-only] #10367
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
the test was rewritten on the 2.13.x branch and (although I'm not positive) I don't remember seeing it fail there, so this backports the 2.13 version, fingers crossed that will put an end to the intermittent failures references scala/scala-dev#831
…uildinfo-0.11.0
|
@SethTisue @lrytz I'll submit a PR to 2.13 as I woke up too early and need quiet play time. |
hamzaremmal
pushed a commit
to hamzaremmal/scala3
that referenced
this pull request
May 2, 2025
hamzaremmal
pushed a commit
to scala/scala3
that referenced
this pull request
May 7, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PICK * 59b872e - 10366 from SethTisue/jdk-20-now-ga
SKIP * 2d9e951 - 10362 from SethTisue/asm-9.4-on-2.12
PICK * c2bab31 - 10354 from scala-steward/update/2.12.x/jquery-3.6.4
PICK * a85e003 - 10341 from scala-steward/update/2.12.x/sbt-buildinfo-0.11.0
SKIP * 4b1dc0b - 10338 from SethTisue/sd-831
SKIP * 28c0d12 - 10306 from SethTisue/test-jdk20-on-ci
SKIP * e6a3a68 - 10313 from lrytz/div-to-float
(I'm labeling as "internal" — the jQuery upgrade is arguably user-visible, but seems inconsequential)