alt/cloud-build
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Escape branch names

Browse Source
This commit is contained in:
Mikhail Gordeev 2019-04-08 00:30:28 +03:00
parent ad41436d23
commit b89c34678a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cloud-build.py
View File

@ -148,6 +148,9 @@ class CB:
for branch in self.branches:
os.makedirs(self.images_dir + branch, exist_ok=True)
def escape_branch(self, branch: str) -> str:
return re.sub(r'\.', '_', branch)
def ensure_mkimage_profiles(self, update: bool = False) -> None:
"""Checks that mkimage-profiles exists or clones it"""
@ -178,8 +181,9 @@ class CB:
for image in self.images:
target = self.target_by_image(image)
for branch in self.branches:
ebranch = self.escape_branch(branch)
requires = ' '.join([target] + branch_requires[branch])
s = f'{target}_{branch}: {requires}; @:'
s = f'{target}_{ebranch}: {requires}; @:'
print(s, file=f)
apt_dir = self.work_dir + 'apt'
@ -215,7 +219,7 @@ class CB:
) -> str:
self.ensure_mkimage_profiles()
target = f'{target}_{branch}'
target = f'{target}_{self.escape_branch(branch)}'
image = re.sub(r'.*/', '', target)
full_target = f'{target}.{kind}'
tarball = f'{self.out_dir}{image}-{self.date}-{arch}.{kind}'