alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-30 20:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'doc/version_specific_inc_bugfix' into 'master'

Browse Source 
docs: wrong version specific includes

Closes DOC-322 and IDFGH-3734

See merge request espressif/esp-idf!9809
This commit is contained in:
Krzysztof Budzynski
2020-07-31 14:31:30 +08:00
parent 2ad8f8c9d2 b529b757aa
commit bda580f3ec
1 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
docs/idf_extensions/gen_version_specific_includes.py
View File

@@ -190,14 +190,9 @@ def write_version_note(template, out_dir, version, ver_type, is_stable):
def get_version(): def get_version():
""" """
Returns a tuple of (name of branch/tag, type branch/tag, is_stable) Returns a tuple of (name of branch/tag/commit-id, type branch/tag/commit, is_stable)
""" """
# Trust what RTD says our version is, if it is set # Use git to look for a tag
version = os.environ.get("READTHEDOCS_VERSION", None)
if version == "latest":
return ("master", "branch", False)
# Otherwise, use git to look for a tag
try: try:
tag = subprocess.check_output(["git", "describe", "--tags", "--exact-match"]).strip().decode('utf-8') tag = subprocess.check_output(["git", "describe", "--tags", "--exact-match"]).strip().decode('utf-8')
is_stable = re.match(r"v[0-9\.]+$", tag) is not None is_stable = re.match(r"v[0-9\.]+$", tag) is not None
@@ -205,16 +200,16 @@ def get_version():
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
pass pass
# No tag, look for a branch # No tag, look at branch name from CI, this will give the correct branch name even if the ref for the branch we
refs = subprocess.check_output(["git", "for-each-ref", "--points-at", "HEAD", "--format", "%(refname)"]).decode('utf-8') # merge into has moved forward before the pipeline runs
print("refs:\n%s" % refs) branch = os.environ.get("CI_COMMIT_REF_NAME", None)
refs = refs.split("\n") if branch is not None:
# Note: this looks for branches in 'origin' because GitLab CI doesn't check out a local branch return (branch, "branch", False)
branches = [r.replace("refs/remotes/origin/","").strip() for r in refs if r.startswith("refs/remotes/origin/")]
if len(branches) == 0: # Try to find the branch name even if docs are built locally
# last resort, return the commit (may happen on Gitlab CI sometimes, unclear why) branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"]).decode('utf-8')
if branch != "HEAD":
return (branch, "branch", False)
# As a last resort we return commit SHA-1, should never happen in CI/docs that should be published
return (subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).strip().decode('utf-8'), "commit", False) return (subprocess.check_output(["git", "rev-parse", "--short", "HEAD"]).strip().decode('utf-8'), "commit", False)
if "master" in branches:
return ("master", "branch", False)
else:
return (branches[0], "branch", False) # take whatever the first branch is