Skip to content
Snippets Groups Projects
Commit fef1011b authored by Matyáš Latner's avatar Matyáš Latner
Browse files

Workaround for AppStore beta version upload

parent 96384c41
No related branches found
No related tags found
No related merge requests found
......@@ -258,22 +258,23 @@ def getVersionNameFromGit() {
String result = stdout.toString().trim();
// for non release branches add number of commits and branch name
if (!"master".equals(branchName)) {
stdout = new ByteArrayOutputStream()
exec {
commandLine 'git', 'rev-list', "${result}..HEAD", '--count'
standardOutput = stdout
}
String numberOfCommits = stdout.toString().trim()
if ("devel".equals(branchName)) {
// add only number of commits for devel branch
result = "${result}-${numberOfCommits}"
} else {
// add branch name and number of commits
result = "${result}-${branchName}-${numberOfCommits}"
}
}
//FIXME workaround for BETA-3.2 AppStore upload
// if (!"master".equals(branchName)) {
// stdout = new ByteArrayOutputStream()
// exec {
// commandLine 'git', 'rev-list', "${result}..HEAD", '--count'
// standardOutput = stdout
// }
// String numberOfCommits = stdout.toString().trim()
//
// if ("devel".equals(branchName)) {
// // add only number of commits for devel branch
// result = "${result}-${numberOfCommits}"
// } else {
// // add branch name and number of commits
// result = "${result}-${branchName}-${numberOfCommits}"
// }
// }
return result
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment