Skip to content

[pull] master from atlassian:master #10

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.

Sign up for GitHub

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

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

[pull] master from atlassian:master #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
075f9f8
Fix release scripts causing "unspecified" version on deb packages for…
aralozkaya May 6, 2025
440e493
Merge pull request #82 from atlassian/HEIMDALL-12404-incorrect-versio…
aralozkaya May 6, 2025
1106d58
Update version file after release(s)
May 6, 2025
9d5731e
Update version file after release(s)
May 6, 2025
6f98155
Merge pull request #83 from atlassian/release-opsview-1746536089
aralozkaya May 6, 2025
086bf8a
Merge branch 'master' into release-oem-1746538061
aralozkaya May 6, 2025
8269034
Merge pull request #84 from atlassian/release-oem-1746538061
aralozkaya May 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions release/integration-builder/oem/oem.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions release/integration-builder/opsview/opsview.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions release/integration-builder/version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"vcenter": "1.0.1",
"vcsa": "1.0.1",
"oem": "1.0.1",
"opsview": "1.0.1"
"oem": "1.0.2",
"opsview": "1.0.2"
}