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

Improve, document and group versioning code in Build.scala #21837

Merged
merged 3 commits into from
Nov 6, 2024

Conversation

WojciechMazur
Copy link
Contributor

@WojciechMazur WojciechMazur commented Oct 23, 2024

  • Introduce developedVersion describing the target for the current release cycle
  • Adapt baseVersion to the effectively revert Set baseVersion to 3.6.0 instead of 3.6.0-RC1 #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

Fixes #21821
Resolves #21812

[test_msi]

@WojciechMazur
Copy link
Contributor Author

WojciechMazur commented Oct 23, 2024

Side note: with change to Windows / version build-msi-package no longer needs to be defined with fixes RELEASEBUILD=yes. We can now try to set this value dynamically to yes only when publishing release from a tag.

Edit:
3rd commit changes build-msi to use dynamic env variable. By default it's set to RELEASEBUILD=no. Only when triggered by tag it was be set to yes

# NECESSARY FLAG TO CORRECTLY CONFIGURE THE VERSION FOR SCALA
RELEASEBUILD: yes
# Release only happends when triggering CI by pushing tag
RELEASEBUILD: ${{ startsWith(github.event.ref, 'refs/tags/') && 'yes' || 'no' }}
Copy link
Member

Choose a reason for hiding this comment

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

Should be fine since the payload in the reusable workflow is inherited from the caller (See https://docs.github.com/en/actions/writing-workflows/choosing-when-your-workflow-runs/events-that-trigger-workflows#workflow_call)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've tested it in a custom repo, it worked as expected

@WojciechMazur WojciechMazur merged commit 11c957c into scala:main Nov 6, 2024
29 checks passed
@WojciechMazur WojciechMazur deleted the build/improve-versions branch November 6, 2024 10:16
@WojciechMazur WojciechMazur added the backport:nominated If we agree to backport this PR, replace this tag with "backport:accepted", otherwise delete it. label Nov 6, 2024
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]
WojciechMazur added a commit that referenced this pull request Nov 8, 2024
…` " to 3.6.2 (#21902)

Backports #21837 to the 3.6.2 branch.

PR submitted by the release tooling.
[skip ci]
@WojciechMazur WojciechMazur added backport:done This PR was successfully backported. and removed backport:nominated If we agree to backport this PR, replace this tag with "backport:accepted", otherwise delete it. labels Nov 8, 2024
@WojciechMazur WojciechMazur added this to the 3.6.2 milestone Nov 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport:done This PR was successfully backported.
Projects
None yet
2 participants