Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
S
stitchEm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Franco (nextime) Lanza
stitchEm
Commits
0faed654
Commit
0faed654
authored
Nov 11, 2019
by
Wieland Morgenstern
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
allow slashes in branch names
parent
95c8daa1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
versionHelper.cpp
apps/src/libvideostitch-gui/mainwindow/versionHelper.cpp
+3
-3
No files found.
apps/src/libvideostitch-gui/mainwindow/versionHelper.cpp
View file @
0faed654
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment