From bab4cf0612d7a3e4b60f3d5e3fbfabc614c5c428 Mon Sep 17 00:00:00 2001 From: Catherine Date: Sat, 13 Jul 2024 15:22:19 +0000 Subject: [PATCH] Fix determination of wasi-sdk version when built in a subdirectory. --- version.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/version.py b/version.py index a3199f12c..62f0ff9ef 100755 --- a/version.py +++ b/version.py @@ -14,13 +14,13 @@ GIT_REF_LEN = 12 -def exec(command, cwd=None): +def exec(command, cwd): result = subprocess.run(command, stdout=subprocess.PIPE, universal_newlines=True, check=True, cwd=cwd) return result.stdout.strip() -def git_commit(dir='.'): +def git_commit(dir): return exec(['git', 'rev-parse', f'--short={GIT_REF_LEN}', 'HEAD'], dir) @@ -61,7 +61,8 @@ def parse_git_version(version): def git_version(): version = exec(['git', 'describe', '--long', '--candidates=999', - '--match=wasi-sdk-*', '--dirty=+m', f'--abbrev={GIT_REF_LEN}']) + '--match=wasi-sdk-*', '--dirty=+m', f'--abbrev={GIT_REF_LEN}'], + os.path.dirname(sys.argv[0])) major, minor, git, dirty = parse_git_version(version) version = f'{major}.{minor}' if git: