Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

tools: fix exception in checkout ref script:

Browse source 
decode bytes before searching with RegEx
This commit is contained in:
He Yin Ling 2019-07-04 16:30:42 +08:00
parent 9ecd0436f5
commit a626061f3c
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
tools/ci/checkout_project_ref.py
View file

@ -34,16 +34,20 @@ def target_branch_candidates(proj_name):
except (KeyError, TypeError):
pass
# branch name read from IDF
git_describe = subprocess.check_output(["git", "describe", "--tags", "HEAD"])
match = IDF_GIT_DESCRIBE_PATTERN.search(git_describe)
if match:
major_revision = match.group(1)
minor_revision = match.group(2)
# release branch
candidates.append("release/v{}.{}".format(major_revision, minor_revision))
# branch to match all major branches, like v3.x or v3
candidates.append("release/v{}.x".format(major_revision))
candidates.append("release/v{}".format(major_revision))
try:
git_describe = subprocess.check_output(["git", "describe", "--tags", "HEAD"])
match = IDF_GIT_DESCRIBE_PATTERN.search(git_describe.decode())
if match:
major_revision = match.group(1)
minor_revision = match.group(2)
# release branch
candidates.append("release/v{}.{}".format(major_revision, minor_revision))
# branch to match all major branches, like v3.x or v3
candidates.append("release/v{}.x".format(major_revision))
candidates.append("release/v{}".format(major_revision))
except subprocess.CalledProcessError:
# this should not happen as IDF should have describe message
pass
return [c for c in candidates if c] # filter out null value