Set baseVersion to 3.6.0 instead of 3.6.0-RC1 #21011
Merged
Conversation
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
| @@ -88,7 +88,7 @@ object Build { | |||
|
|
|||
| val referenceVersion = "3.4.2-RC1" | |||
|
|
|||
| val baseVersion = "3.6.0-RC1" | |||
| val baseVersion = "3.6.0" | |||
There was a problem hiding this comment.
This change would break our current versioning of nightlies, which are defined using pattern <baseVersion>-bin-YYYYMMDD-<commitSHA>-NIGHTLY
In theory all nightlies are always -RC1 so there should be no conflicts with this one.
@Kordyjan any thoughts on that?
There was a problem hiding this comment.
we can always add the -RC1 at the beginning of the nightlies' pattern instead of relying on its presence in baseVersion if we must keep the same pattern :
Line 172 in 010ed5a
Kordyjan
approved these changes
Jul 11, 2024
bishabosha
reviewed
Jul 11, 2024
| @@ -169,9 +171,9 @@ object Build { | |||
| if (isRelease) | |||
| baseVersion | |||
| else if (isNightly) | |||
| baseVersion + "-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY" | |||
| baseVersion + "-RC1-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY" | |||
There was a problem hiding this comment.
Suggested change
| baseVersion + "-RC1-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY" | |
| prereleaseVersion + "-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY" |
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.
bishabosha
reviewed
Jul 11, 2024
| else | ||
| baseVersion + "-bin-SNAPSHOT" | ||
| baseVersion + "-RC1-bin-SNAPSHOT" |
There was a problem hiding this comment.
Suggested change
| baseVersion + "-RC1-bin-SNAPSHOT" | |
| prereleaseVersion + "-bin-SNAPSHOT" |
bishabosha
reviewed
Oct 18, 2024
| @@ -169,9 +171,9 @@ object Build { | |||
| if (isRelease) | |||
WojciechMazur
added a commit
that referenced
this pull request
Nov 6, 2024
…21837) * Introduce `developedVersion` describing the target for the current release cycle * Adapt `baseVersion` to the effectively revert #21011 changes * Adapt .msi packager to use `developedVersion` as a workaround to MSI ProductInfo limitations (version without RC suffix required) * Group and document versioning related code
WojciechMazur
added a commit
that referenced
this pull request
Nov 6, 2024
…21837) * Introduce `developedVersion` describing the target for the current release cycle * Adapt `baseVersion` to the effectively revert #21011 changes * Adapt .msi packager to use `developedVersion` as a workaround to MSI ProductInfo limitations (version without RC suffix required) * Group and document versioning related code [Cherry-picked 11c957c][modified]
WojciechMazur
added a commit
that referenced
this pull request
Nov 6, 2024
…21837) * Introduce `developedVersion` describing the target for the current release cycle * Adapt `baseVersion` to the effectively revert #21011 changes * Adapt .msi packager to use `developedVersion` as a workaround to MSI ProductInfo limitations (version without RC suffix required) * Group and document versioning related code [Cherry-picked 11c957c][modified]
WojciechMazur
added a commit
that referenced
this pull request
Nov 6, 2024
…21837) * Introduce `developedVersion` describing the target for the current release cycle * Adapt `baseVersion` to the effectively revert #21011 changes * Adapt .msi packager to use `developedVersion` as a workaround to MSI ProductInfo limitations (version without RC suffix required) * Group and document versioning related code [Cherry-picked 11c957c][modified]
WojciechMazur
added a commit
that referenced
this pull request
Nov 6, 2024
…21837) * Introduce `developedVersion` describing the target for the current release cycle * Adapt `baseVersion` to the effectively revert #21011 changes * Adapt .msi packager to use `developedVersion` as a workaround to MSI ProductInfo limitations (version without RC suffix required) * Group and document versioning related code [Cherry-picked 11c957c][modified]
KacperFKorban
pushed a commit
to dotty-staging/dotty
that referenced
this pull request
Nov 20, 2024
…cala#21837) * Introduce `developedVersion` describing the target for the current release cycle * Adapt `baseVersion` to the effectively revert scala#21011 changes * Adapt .msi packager to use `developedVersion` as a workaround to MSI ProductInfo limitations (version without RC suffix required) * Group and document versioning related code
KacperFKorban
pushed a commit
to dotty-staging/dotty
that referenced
this pull request
Nov 29, 2024
…cala#21837) * Introduce `developedVersion` describing the target for the current release cycle * Adapt `baseVersion` to the effectively revert scala#21011 changes * Adapt .msi packager to use `developedVersion` as a workaround to MSI ProductInfo limitations (version without RC suffix required) * Group and document versioning related code
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.
In #20547, to be able to build an msi installer, the version needs to have the following pattern
A.B.C.D.This change should be fine but the release procedure of RC1 will have to take it into account.