espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages 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
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): except (KeyError, TypeError):
pass pass
# branch name read from IDF # branch name read from IDF
git_describe = subprocess.check_output(["git", "describe", "--tags", "HEAD"]) try:
match = IDF_GIT_DESCRIBE_PATTERN.search(git_describe) git_describe = subprocess.check_output(["git", "describe", "--tags", "HEAD"])
if match: match = IDF_GIT_DESCRIBE_PATTERN.search(git_describe.decode())
major_revision = match.group(1) if match:
minor_revision = match.group(2) major_revision = match.group(1)
# release branch minor_revision = match.group(2)
candidates.append("release/v{}.{}".format(major_revision, minor_revision)) # release branch
# branch to match all major branches, like v3.x or v3 candidates.append("release/v{}.{}".format(major_revision, minor_revision))
candidates.append("release/v{}.x".format(major_revision)) # branch to match all major branches, like v3.x or v3
candidates.append("release/v{}".format(major_revision)) 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 return [c for c in candidates if c] # filter out null value