languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-07-20 09:54:38 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Reland "[build] Don't combine stdout and stderr when consuming git output."

Browse source 
Ignore non-zero exit code during GetGitRevision.

Bug: https://github.com/flutter/flutter/issues/123416
Bug: https://github.com/dart-lang/sdk/issues/51865
Change-Id: Ifff7251d478cfd742a60ba6dcdeb60e581279b75
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/291300
Reviewed-by: Alexander Aprelev <aam@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
This commit is contained in:
Ryan Macnak 2023-03-27 18:02:38 +00:00 committed by Commit Queue
parent 98f18ec45a
commit ec8688d97a
1 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
tools/utils.py
View file

@ -500,11 +500,14 @@ def GetGitRevision(git_revision_file=None, repo_path=DART_DIR):
pass
p = subprocess.Popen(['git', 'rev-parse', 'HEAD'],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stderr=subprocess.PIPE,
shell=IsWindows(),
cwd=repo_path)
output, _ = p.communicate()
revision = output.decode('utf-8').strip()
out, err = p.communicate()
# TODO(https://github.com/dart-lang/sdk/issues/51865): Don't ignore errors.
# if p.wait() != 0:
# raise Exception('git rev-parse failed: ' + str(err))
revision = out.decode('utf-8').strip()
# We expect a full git hash
if len(revision) != 40:
print('Warning: Could not parse git commit, output was {}'.format(
@ -517,13 +520,15 @@ def GetGitRevision(git_revision_file=None, repo_path=DART_DIR):
def GetShortGitHash(repo_path=DART_DIR):
p = subprocess.Popen(['git', 'rev-parse', '--short=10', 'HEAD'],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stderr=subprocess.PIPE,
shell=IsWindows(),
cwd=repo_path)
output, _ = p.communicate()
revision = output.decode('utf-8').strip()
out, err = p.communicate()
if p.wait() != 0:
# TODO(https://github.com/dart-lang/sdk/issues/51865): Don't ignore errors.
# raise Exception('git rev-parse failed: ' + str(err))
return None
revision = out.decode('utf-8').strip()
return revision
@ -540,16 +545,16 @@ def GetLatestDevTag(repo_path=DART_DIR):
]
p = subprocess.Popen(cmd,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stderr=subprocess.PIPE,
shell=IsWindows(),
cwd=repo_path)
output, _ = p.communicate()
tag = output.decode('utf-8').strip()
out, err = p.communicate()
if p.wait() != 0:
print('Warning: Could not get the most recent dev branch tag {}'.format(
tag),
file=sys.stderr)
return None
tag = out.decode('utf-8').strip()
return tag
@ -564,24 +569,29 @@ def GetGitTimestamp(git_timestamp_file=None, repo_path=DART_DIR):
pass
p = subprocess.Popen(['git', 'log', '-n', '1', '--pretty=format:%cd'],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stderr=subprocess.PIPE,
shell=IsWindows(),
cwd=repo_path)
output, _ = p.communicate()
timestamp = output.decode('utf-8').strip()
out, err = p.communicate()
if p.wait() != 0:
# TODO(https://github.com/dart-lang/sdk/issues/51865): Don't ignore errors.
# raise Exception('git log failed: ' + str(err))
return None
timestamp = out.decode('utf-8').strip()
return timestamp
def GetGitNumber(repo_path=DART_DIR):
p = subprocess.Popen(['git', 'rev-list', 'HEAD', '--count'],
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT,
stderr=subprocess.PIPE,
shell=IsWindows(),
cwd=repo_path)
output, _ = p.communicate()
number = output.decode('utf-8').strip()
out, err = p.communicate()
# TODO(https://github.com/dart-lang/sdk/issues/51865): Don't ignore errors.
# if p.wait() != 0:
# raise Exception('git rev-list failed: ' + str(err))
number = out.decode('utf-8').strip()
try:
number = int(number)
return number + GIT_NUMBER_BASE