Merge pull request #7564 from Neradoc/update-sh-to-2.0.0

Update build_board_info.py to sh module 2.0.0
This commit is contained in:
MicroDev 2023-02-10 10:41:37 +05:30 committed by GitHub
commit e3b924b1b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -10,6 +10,7 @@ import subprocess
import sys
import sh
import base64
from io import StringIO
from datetime import date
from sh.contrib import git
@ -58,9 +59,13 @@ def get_languages(list_all=False):
def get_version_info():
version = None
sha = git("rev-parse", "--short", "HEAD").stdout.decode("utf-8")
buffer = StringIO()
git("rev-parse", "--short", "HEAD", _out=buffer)
sha = buffer.getvalue().strip()
try:
version = git("describe", "--tags", "--exact-match").stdout.decode("utf-8").strip()
buffer = StringIO()
git("describe", "--tags", "--exact-match", _out=buffer)
version = buffer.getvalue().strip()
except sh.ErrorReturnCode_128:
# No exact match
pass