Commit 0faed654 authored by Wieland Morgenstern's avatar Wieland Morgenstern

allow slashes in branch names

parent 95c8daa1
...@@ -172,9 +172,9 @@ bool getAppsInfoComponents(const QString& infoString, QString& appName, AppsVers ...@@ -172,9 +172,9 @@ bool getAppsInfoComponents(const QString& infoString, QString& appName, AppsVers
// Release versions won't have commits count and commit hash // Release versions won't have commits count and commit hash
QRegularExpression versionInfoExpression( QRegularExpression versionInfoExpression(
"(VahanaVR|Studio)-[0-9.a-zA-Z]+-?\\d*-[a-zA-Z0-9]*-[a-zA-Z0-9-]+\\.\\d{4}-\\d{2}-\\d{2}"); R"((VahanaVR|Studio)-[0-9.a-zA-Z]+-?\d*-[a-zA-Z0-9]*-[a-zA-Z0-9-\/]+\.\d{4}-\d{2}-\d{2})");
if (!versionInfoExpression.match(infoString).hasMatch()) { if (!versionInfoExpression.match(infoString).hasMatch()) {
LogManager::getInstance()->writeToLogFile("Error: the current version doesn't respect the version template"); LogManager::getInstance()->writeToLogFile("Error: the current version doesn't respect the version template (regex)");
return false; return false;
} }
...@@ -198,7 +198,7 @@ bool getAppsInfoComponents(const QString& infoString, QString& appName, AppsVers ...@@ -198,7 +198,7 @@ bool getAppsInfoComponents(const QString& infoString, QString& appName, AppsVers
if (isDevVersion) { if (isDevVersion) {
components = branchName.split("-"); components = branchName.split("-");
if (components.size() < 3) { if (components.size() < 3) {
LogManager::getInstance()->writeToLogFile("Error: the current version doesn't respect the version template"); LogManager::getInstance()->writeToLogFile("Error: the current version doesn't respect the version template (dev version branch name)");
return false; return false;
} }
commitCount = components.takeFirst().toInt(); commitCount = components.takeFirst().toInt();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment