lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-10-24 13:32:59 +03:00
Code Activity

Merge pull request #10416 from bensze01/abicheck-worktree-submodules

Browse Source 
Use submodule work trees during ABI check
This commit is contained in:
Ronald Cron
2025-09-30 07:32:22 +00:00
committed by GitHub
parent fd9b5d5f09 9defedb833
commit 6a9be3de1f
1 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
scripts/abi_check.py
View File

@@ -197,11 +197,32 @@ class AbiChecker:
"""If the crypto submodule is present, initialize it. """If the crypto submodule is present, initialize it.
if version.crypto_revision exists, update it to that revision, if version.crypto_revision exists, update it to that revision,
otherwise update it to the default revision""" otherwise update it to the default revision"""
update_output = subprocess.check_output( submodule_output = subprocess.check_output(
[self.git_command, "submodule", "update", "--init", '--recursive'], [self.git_command, "submodule", "foreach", "--recursive",
cwd=git_worktree_path, f'git worktree add --detach "{git_worktree_path}/$displaypath" HEAD'],
cwd=self.repo_path,
stderr=subprocess.STDOUT stderr=subprocess.STDOUT
) )
self.log.debug(submodule_output.decode("utf-8"))
try:
# Try to update the submodules using local commits
# (Git will sometimes insist on fetching the remote without --no-fetch
# if the submodules are shallow clones)
update_output = subprocess.check_output(
[self.git_command, "submodule", "update", "--init", '--recursive', '--no-fetch'],
cwd=git_worktree_path,
stderr=subprocess.STDOUT
)
except subprocess.CalledProcessError as err:
self.log.debug(err.stdout.decode("utf-8"))
# Checkout with --no-fetch failed, falling back to fetching from origin
update_output = subprocess.check_output(
[self.git_command, "submodule", "update", "--init", '--recursive'],
cwd=git_worktree_path,
stderr=subprocess.STDOUT
)
self.log.debug(update_output.decode("utf-8")) self.log.debug(update_output.decode("utf-8"))
if not (os.path.exists(os.path.join(git_worktree_path, "crypto")) if not (os.path.exists(os.path.join(git_worktree_path, "crypto"))
and version.crypto_revision): and version.crypto_revision):
@@ -390,8 +411,15 @@ class AbiChecker:
def _cleanup_worktree(self, git_worktree_path): def _cleanup_worktree(self, git_worktree_path):
"""Remove the specified git worktree.""" """Remove the specified git worktree."""
shutil.rmtree(git_worktree_path) shutil.rmtree(git_worktree_path)
submodule_output = subprocess.check_output(
[self.git_command, "submodule", "foreach", "--recursive",
f'git worktree remove "{git_worktree_path}/$displaypath"'],
cwd=self.repo_path,
stderr=subprocess.STDOUT
)
self.log.debug(submodule_output.decode("utf-8"))
worktree_output = subprocess.check_output( worktree_output = subprocess.check_output(
[self.git_command, "worktree", "prune"], [self.git_command, "worktree", "remove", git_worktree_path],
cwd=self.repo_path, cwd=self.repo_path,
stderr=subprocess.STDOUT stderr=subprocess.STDOUT
) )