Set baseVersion to 3.6.0 instead of 3.6.0-RC1 #21011
There are no files selected for viewing
This file contains 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
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -88,7 +88,9 @@ object Build { | |||||
|
|
||||||
| val referenceVersion = "3.4.2-RC1" | ||||||
|
|
||||||
| val baseVersion = "3.6.0" | ||||||
| // Will be required by some automation later | ||||||
| val prereleaseVersion = s"$baseVersion-RC1" | ||||||
|
|
||||||
| // LTS or Next | ||||||
| val versionLine = "Next" | ||||||
|
|
@@ -169,9 +171,9 @@ object Build { | |||||
| if (isRelease) | ||||||
| baseVersion | ||||||
| else if (isNightly) | ||||||
| baseVersion + "-RC1-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY" | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. idk if this makes more sense There was a problem hiding this comment. @Kordyjan asked me to add this field for a future automation. I'm not sure what it is so I would rather not use it until then. To see if it makes sense to use it in a more general context. |
||||||
| else | ||||||
| baseVersion + "-RC1-bin-SNAPSHOT" | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
| val dottyNonBootstrappedVersion = { | ||||||
| // Make sure sbt always computes the scalaBinaryVersion correctly | ||||||
|
|
||||||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change would break our current versioning of nightlies, which are defined using pattern
<baseVersion>-bin-YYYYMMDD-<commitSHA>-NIGHTLYIn theory all nightlies are always
-RC1so there should be no conflicts with this one.@Kordyjan any thoughts on that?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we can always add the
-RC1at the beginning of the nightlies' pattern instead of relying on its presence inbaseVersionif we must keep the same pattern :scala3/project/Build.scala
Line 172 in 010ed5a