QuasarApp/QuasarAppCI
4
0
Fork 0
mirror of https://github.com/QuasarApp/QuasarAppCI.git synced 2025-04-26 05:44:31 +00:00
Code Issues Projects Releases Wiki Activity

fix docs pathses

Browse Source
This commit is contained in:
Andrei Yankovich 2021-04-16 23:45:57 +03:00
parent acd1d3001e
commit 1a534836ef
2 changed files with 37 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BuildBotLib/docs.py
View File

@ -54,3 +54,13 @@ class Docs(CMake):
default="Distro"
),
]
def destDirPrivate(self, props):
repo = str(props.getProperty('repository'))
branch = str(props.getProperty('branch'))
name = branch
if branch == "main" or branch == "master":
name = "latest"
return "docs/" + self.getNameProjectFromGitUrl(repo) + "/" + name

44
BuildBotLib/make.py
View File

@ -20,21 +20,13 @@ class Make(BaseModule):
@util.renderer
def cmdWraper(step):
repository = step.getProperty('repository')
if not len(repository):
project = self.getNameProjectFromGitUrl(repository)
if not len(project):
return "build"
repository = repository.replace('.git', '')
begin = repository.rfind('/')
begin = max(repository.rfind('/', 0, begin),
repository.rfind(':', 0, begin))
if begin < 0:
return "build"
project = repository[begin + 1:len(repository)]
return project
return cmdWraper
def isSupport(self, step):
@ -49,21 +41,39 @@ class Make(BaseModule):
def isTest(self, step):
return step.getProperty('test')
def getNameProjectFromGitUrl(self, url):
return url[url.rfind('/') + 1: len(url) - 4]
def getNameProjectFromGitUrl(self, repository):
if not len(repository):
return ""
repository = repository.replace('.git', '')
begin = repository.rfind('/')
begin = max(repository.rfind('/', 0, begin),
repository.rfind(':', 0, begin))
if begin < 0:
return ""
project = repository[begin + 1:len(repository)]
return project
def destDirPrivate(self, props):
repo = str(props.getProperty('repository'))
now = datetime.datetime.now().strftime("(%H_%M)_%m-%d-%Y")
buildnumber = str(props.getProperty('buildnumber'))
got_revision = str(props.getProperty('got_revision'))
return self.getNameProjectFromGitUrl(repo) + "/" + now
name = buildnumber + "_" + got_revision
return self.getNameProjectFromGitUrl(repo) + "/" + name
def tempDirPrivate(self, props):
repo = str(props.getProperty('repository'))
now = datetime.datetime.now().strftime("(%H_%M_%S)_%m-%d-%Y")
buildnumber = str(props.getProperty('buildnumber'))
got_revision = str(props.getProperty('got_revision'))
name = buildnumber + "_" + got_revision
m = hashlib.md5()
repoPath = self.getNameProjectFromGitUrl(repo) + "/" + now
repoPath = self.getNameProjectFromGitUrl(repo) + "/" + name
m.update(repoPath.encode('utf-8'))