fixes to bumpVersion task, so it needs newVersion parameter

Signed-off-by: Alfredo Gutierrez <[email protected]>
hashgraph · Jan 14, 2025 · 8748ec8 · 8748ec8
1 parent 543ee3e
commit 8748ec8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/.github/workflows/release-automation.yaml b/.github/workflows/release-automation.yaml
@@ -104,7 +104,7 @@ jobs:
       #  run: ./gradlew release -Pversion=${{ env.VERSION }}
 
       - name: Bump Version
-        run: ./gradlew bumpVersion -Pversion=${{ env.VERSION }}
+        run: ./gradlew bumpVersion -PnewVersion=${{ env.VERSION }}
 
       - name: Close the Milestone
         if: ${{ steps.version_parser.outputs.prerelease == '' }}
@@ -192,7 +192,7 @@ jobs:
           git reset --hard $RELEASE_BRANCH
 
       - name: Gradle Release for Next Minor Snapshot
-        run: ./gradlew bumpVersion -Pversion=${{ env.NEXT_VERSION_SNAPSHOT }}
+        run: ./gradlew bumpVersion -PnewVersion=${{ env.NEXT_VERSION_SNAPSHOT }}
 
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # v7.0.6

diff --git a/server/build.gradle.kts b/server/build.gradle.kts
@@ -36,9 +36,9 @@ testModuleInfo {
 
 // Release related tasks
 
-fun replaceVersion(files: String, match: String) {
+fun replaceVersion(files: String, match: String, newVersion: String) {
     ant.withGroovyBuilder {
-        "replaceregexp"("match" to match, "replace" to project.version, "flags" to "gm") {
+        "replaceregexp"("match" to match, "replace" to newVersion, "flags" to "gm") {
             "fileset"(
                 "dir" to rootProject.projectDir,
                 "includes" to files,
@@ -52,8 +52,11 @@ tasks.register("bumpVersion") {
     description = "Bump versions of the project"
     group = "release"
 
-    replaceVersion("charts/**/Chart.yaml", "(?<=^(appVersion|version): ).+")
-    replaceVersion("gradle.properties", "(?<=^version=).+")
+    val newVersion = project.findProperty("newVersion") as String? ?: throw GradleException("Please provide -PnewVersion=<version>")
+
+
+    replaceVersion("charts/**/Chart.yaml", "(?<=^(appVersion|version): ).+", newVersion)
+    replaceVersion("version.txt", ".+", newVersion)
 }
 
 // Vals