From 075f9f869a5ff0eb26c1988055b41db56c1c978b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=B0brahim=20Aral=20=C3=96zkaya?= <41003972+aralozkaya@users.noreply.github.com> Date: Tue, 6 May 2025 15:48:04 +0300 Subject: [PATCH 1/3] Fix release scripts causing "unspecified" version on deb packages for without-jec releases. --- release/integration-builder/oem/oem.gradle | 3 +-- release/integration-builder/opsview/opsview.gradle | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/release/integration-builder/oem/oem.gradle b/release/integration-builder/oem/oem.gradle index 4e7ca06..8ead2ae 100644 --- a/release/integration-builder/oem/oem.gradle +++ b/release/integration-builder/oem/oem.gradle @@ -85,7 +85,6 @@ def buildDebForOEM(String sourceDir, String name, String descrpt, Map fileMappin def controlDir = "${project.buildDir}/debian_tmp/${sourceDir}/control" def controlTarget = "${project.buildDir}/deb/control" - def debVersion = version.toString().replace("-", ".") //CONTROL copy { @@ -98,7 +97,7 @@ def buildDebForOEM(String sourceDir, String name, String descrpt, Map fileMappin from "${project.projectDir}/oem/native/control_deb" filter { it.replace('[description]', "'jsm client files'") - .replace('[version]', debVersion) + .replace('[version]', packageVersion) .replace('[package-name]', "jsm-oem") } into controlDir diff --git a/release/integration-builder/opsview/opsview.gradle b/release/integration-builder/opsview/opsview.gradle index b2157c5..3a08cfe 100644 --- a/release/integration-builder/opsview/opsview.gradle +++ b/release/integration-builder/opsview/opsview.gradle @@ -68,13 +68,12 @@ def buildDebForOpsviewV6(String sourceDir, String name, String descrpt, Map file def controlDir = "${project.buildDir}/debian_tmp/${sourceDir}/control" def controlTarget = "${project.buildDir}/deb/control" - def debVersion = version.toString().replace("-", ".") copy { from "${project.projectDir}/opsview/native/control_deb" filter { it.replace('[description]', "'Jsm client files'") - .replace('[version]', debVersion) + .replace('[version]', packageVersion) .replace('[package-name]', "jsm-opsview") } into controlDir From 1106d58ea595c78ec9761666e99579cb0e073588 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 6 May 2025 12:54:49 +0000 Subject: [PATCH 2/3] Update version file after release(s) --- release/integration-builder/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/integration-builder/version.json b/release/integration-builder/version.json index b89a4bf..f7da1dd 100644 --- a/release/integration-builder/version.json +++ b/release/integration-builder/version.json @@ -2,5 +2,5 @@ "vcenter": "1.0.1", "vcsa": "1.0.1", "oem": "1.0.1", - "opsview": "1.0.1" + "opsview": "1.0.2" } From 9d5731e7468b5678d5d9a1f29550e3610ec2c922 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Tue, 6 May 2025 13:27:41 +0000 Subject: [PATCH 3/3] Update version file after release(s) --- release/integration-builder/version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/integration-builder/version.json b/release/integration-builder/version.json index b89a4bf..7b531b9 100644 --- a/release/integration-builder/version.json +++ b/release/integration-builder/version.json @@ -1,6 +1,6 @@ { "vcenter": "1.0.1", "vcsa": "1.0.1", - "oem": "1.0.1", + "oem": "1.0.2", "opsview": "1.0.1" }