From 5c4f98bbc5b0ca049be5c10eb47374e3ac16436e Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 27 Jun 2025 14:49:41 +0100 Subject: [PATCH] CI: add CI_CLEAN_REPOS variable to allow cleaning the repo reference cache If the repository reference directory gets corrupted it's not easy to wipe it, so add a variable CI_CLEAN_REPOS that if set in the pipeline will clean the clones and re-fetch them. Also, stop the fetch from detaching during the garbage collection, just in case it was a long-running GC that got killed that caused the corruption in the first place. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .gitlab-ci.yml | 3 ++- ci/update-repos | 8 +++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5aad0300..fd6cbd57 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,7 +66,8 @@ stages: # -# Prep stage, update repositories once +# Prep stage, update repositories once. +# Set the CI variable CI_CLEAN_REPOS=1 to refetch the respositories from scratch # update-repos: extends: .setup diff --git a/ci/update-repos b/ci/update-repos index d1b6c026..5ac08312 100755 --- a/ci/update-repos +++ b/ci/update-repos @@ -4,6 +4,7 @@ import sys import os +import shutil import subprocess import pathlib @@ -35,9 +36,14 @@ if __name__ == "__main__": for repo in repositories: repodir = base_repodir / repo_shortname(repo) + + if "CI_CLEAN_REPOS" in os.environ: + print("Cleaning %s..." % repo) + shutil.rmtree(repodir, ignore_errors=True) + if repodir.exists(): print("Updating %s..." % repo) - subprocess.run(["git", "-C", repodir, "fetch"], check=True) + subprocess.run(["git", "-C", repodir, "-c", "gc.autoDetach=false", "fetch"], check=True) else: print("Cloning %s..." % repo) subprocess.run(["git", "clone", "--bare", repo, repodir], check=True)