Skip to content

Commit

Permalink
Define a single property for the releaseVersion and use in property
Browse files Browse the repository at this point in the history
Actually the both properties 'releaseNumberSDK' and
'releaseNumberPlatform' are always the same and even if the comment
mentions they might be different at some time it is better to unify them
until then.

Because of this there is now a new 'releaseVersion' defined as a single
property.
  • Loading branch information
laeubi authored and akurtakov committed Nov 24, 2024
1 parent 56ba8ab commit 5bddc6c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/prepareRelease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
- name: Update Main Versions
run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
- name: Update Release Versions
run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:set-property -Dproperties=releaseVersion,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewreleaseVersion=${{ github.event.milestone.title }}
- name: Create Pull Request for Release ${{ github.event.milestone.title }}
uses: peter-evans/create-pull-request@5e914681df9dc83aa4e4905692ca88beb2f9e91f # v7.0.5
with:
Expand Down
5 changes: 3 additions & 2 deletions eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
See bug 328139.
-->
<releaseName>2025-03</releaseName>
<releaseVersion>4.35</releaseVersion>
<!--
The releaseNumbers below, for SDK and Platform, might be
thought of as the "marketing number" or "branding number",
Expand All @@ -64,8 +65,8 @@
but we'd still want the "marketing number" to be increased to reflect
"a new yearly release".
-->
<releaseNumberSDK>4.35</releaseNumberSDK>
<releaseNumberPlatform>4.35</releaseNumberPlatform>
<releaseNumberSDK>${releaseVersion}</releaseNumberSDK>
<releaseNumberPlatform>${releaseVersion}</releaseNumberPlatform>

<tycho.version>4.0.10</tycho.version>

Expand Down

0 comments on commit 5bddc6c

Please sign in to comment.