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

Set baseVersion to 3.6.0 instead of 3.6.0-RC1 #21011

Merged
merged 1 commit into from
Jul 11, 2024

Conversation

hamzaremmal
Copy link
Member

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.

@@ -88,7 +88,7 @@ object Build {

val referenceVersion = "3.4.2-RC1"

val baseVersion = "3.6.0-RC1"
val baseVersion = "3.6.0"
Copy link
Contributor

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>-NIGHTLY
In theory all nightlies are always -RC1 so there should be no conflicts with this one.
@Kordyjan any thoughts on that?

Copy link
Member Author

@hamzaremmal hamzaremmal Jul 4, 2024

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 -RC1 at the beginning of the nightlies' pattern instead of relying on its presence in baseVersion if we must keep the same pattern :

baseVersion + "-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"

@@ -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"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
baseVersion + "-RC1-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
prereleaseVersion + "-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idk if this makes more sense

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@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 + "-bin-SNAPSHOT"
baseVersion + "-RC1-bin-SNAPSHOT"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
baseVersion + "-RC1-bin-SNAPSHOT"
prereleaseVersion + "-bin-SNAPSHOT"

@hamzaremmal hamzaremmal merged commit 26a35cc into scala:main Jul 11, 2024
22 checks passed
@hamzaremmal hamzaremmal deleted the base-3.6.0 branch July 11, 2024 10:16
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.

4 participants