GitLab Commit is coming up on August 3-4. Learn how to innovate together using GitLab, the DevOps platform. Register for free: gitlabcommitvirtual2021.com

Commit 380f3b2e authored by Hans-Christoph Steiner's avatar Hans-Christoph Steiner
Browse files

Merge branch 'fix/checkupdateCommit' into 'master'

Use tag if known

See merge request !872
parents 234dc9b4 24dd6740
Pipeline #282605027 passed with stage
in 13 minutes and 53 seconds
......@@ -518,9 +518,13 @@ def checkupdates_app(app):
newbuild.versionCode = app.CurrentVersionCode
newbuild.versionName = app.CurrentVersion + suffix.replace('%c', newbuild.versionCode)
logging.info("...auto-generating build for " + newbuild.versionName)
commit = pattern.replace('%v', app.CurrentVersion)
commit = commit.replace('%c', newbuild.versionCode)
newbuild.commit = commit
if tag:
newbuild.commit = tag
else:
commit = pattern.replace('%v', app.CurrentVersion)
commit = commit.replace('%c', newbuild.versionCode)
newbuild.commit = commit
app['Builds'].append(newbuild)
name = _getappname(app)
ver = _getcvname(app)
......
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