entrouvert
/
scrutiny
16
0
Fork 0
Code Issues Pull Requests Releases Activity

extend version regex to allow longer hashes and a dash as prefix (#87647)
gitea/scrutiny/pipeline/head This commit looks good Details

This commit is contained in:
Frédéric Péters 2024-03-01 08:51:44 +01:00
parent 57e73caa43
commit 05a79bf8e6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scrutiny/projects/models.py
View File

@ -137,10 +137,12 @@ class Module(models.Model):
return [force_str(x).split(' ', 1) for x in stdout.splitlines()]
def get_version_hash(self, version_number):
if re.findall(r'\.g([0-9a-f]{7})', version_number):
return re.findall(r'\.g([0-9a-f]{7})', version_number)[0]
if re.findall(r'\+g([0-9a-f]{7})', version_number):
return re.findall(r'\+g([0-9a-f]{7})', version_number)[0]
if re.findall(r'\.g([0-9a-f]{7,12})', version_number):
return re.findall(r'\.g([0-9a-f]{7,12})', version_number)[0]
if re.findall(r'\+g([0-9a-f]{7,12})', version_number):
return re.findall(r'\+g([0-9a-f]{7,12})', version_number)[0]
if re.findall(r'\-g([0-9a-f]{7,12})', version_number):
return re.findall(r'\-g([0-9a-f]{7,12})', version_number)[0]
tagname = 'v' + version_number
kws = {}
kws['stdout'] = subprocess.PIPE
@ -163,10 +165,12 @@ class Module(models.Model):
cmd.append(grep)
def get_ref(v):
if re.findall(r'\.g([0-9a-f]{7})', v):
return re.findall(r'\.g([0-9a-f]{7})', v)[0]
if re.findall(r'\+g([0-9a-f]{7})', v):
return re.findall(r'\+g([0-9a-f]{7})', v)[0]
if re.findall(r'\.g([0-9a-f]{7,12})', v):
return re.findall(r'\.g([0-9a-f]{7,12})', v)[0]
if re.findall(r'\+g([0-9a-f]{7,12})', v):
return re.findall(r'\+g([0-9a-f]{7,12})', v)[0]
if re.findall(r'\-g([0-9a-f]{7,12})', version_number):
return re.findall(r'\-g([0-9a-f]{7,12})', version_number)[0]
return 'v' + v
cmd.append('%s...%s' % (get_ref(v1), get_ref(v2)))