espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

CI: get git describe from annotated tags:

Browse Source 
we should only parse IDF version from annotated tags
This commit is contained in:
He Yin Ling
2020-09-29 11:20:05 +08:00
parent 17fca6235b
commit fcda778a11
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/ci/check_idf_version.sh
View File

@ -33,7 +33,7 @@ cmake_ver_minor=$(get_ver_from_cmake IDF_VERSION_MINOR)
cmake_ver_patch=$(get_ver_from_cmake IDF_VERSION_PATCH) cmake_ver_patch=$(get_ver_from_cmake IDF_VERSION_PATCH)
version_from_cmake="${cmake_ver_major}.${cmake_ver_minor}.${cmake_ver_patch}" version_from_cmake="${cmake_ver_major}.${cmake_ver_minor}.${cmake_ver_patch}"
git_desc=$(git describe --tags) git_desc=$(git describe)
git_desc_regex="^v([0-9]+)\.([0-9]+)(\.([0-9]+))?.*$" git_desc_regex="^v([0-9]+)\.([0-9]+)(\.([0-9]+))?.*$"
if [[ ! ${git_desc} =~ ${git_desc_regex} ]]; then if [[ ! ${git_desc} =~ ${git_desc_regex} ]]; then
echo "Could not determine the version from 'git describe' output: ${git_desc}" echo "Could not determine the version from 'git describe' output: ${git_desc}"

2
tools/ci/checkout_project_ref.py
View File

@ -35,7 +35,7 @@ def target_branch_candidates(proj_name):
pass pass
# branch name read from IDF # branch name read from IDF
try: try:
git_describe = subprocess.check_output(["git", "describe", "--tags", "HEAD"]) git_describe = subprocess.check_output(["git", "describe", "HEAD"])
match = IDF_GIT_DESCRIBE_PATTERN.search(git_describe.decode()) match = IDF_GIT_DESCRIBE_PATTERN.search(git_describe.decode())
if match: if match:
major_revision = match.group(1) major_revision = match.group(1)