Skip to content

[ci] One clone less #23309

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
dpiparo wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

[ci] One clone less #23309

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 25 additions & 12 deletions .github/workflows/root-ci-config/build_root.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@
S3URL = 'https://s3.cern.ch/swift/v1/' + S3CONTAINER # Used for downloads

WINDOWS = (os.name == 'nt')
WORKDIR = (os.environ['HOME'] + '/ROOT-CI') if not WINDOWS else 'C:/ROOT-CI'
HOMEDIR = os.environ['HOME'] if not WINDOWS else 'C:'
WORKDIR = HOMEDIR + '/ROOT-CI'
CLONEDIRECTORY = HOMEDIR + '/actions-runner/_work/root/root'
if is_macos():
CLONEDIRECTORY += '/src'
COMPRESSIONLEVEL = 1 if WINDOWS else 2

def main():
Expand Down Expand Up @@ -305,23 +309,32 @@ def git_pull(directory: str, repository: str, branch: str):
sleep_time_unit = 3
for attempt in range(1, max_attempts+1):
targetdir = os.path.join(WORKDIR, directory)
if os.path.exists(os.path.join(targetdir, ".git")):
if not os.path.exists(os.path.join(targetdir, ".git")):
build_utils.print_info(f"""Copying sources from {CLONEDIRECTORY} to {targetdir}""")
try:
shutil.copytree(CLONEDIRECTORY, targetdir)
returncode = 0
except Exception as e:
if hasattr(e, 'message'):
print(e.message)
else:
print(e)
shutil.rmtree(targetdir)
build_utils.print_error(f"""Error copying sources from {CLONEDIRECTORY} to {targetdir}!""")
returncode = 1

if returncode == 0:
returncode = subprocess_with_log(f"""
cd '{targetdir}'
git checkout {branch}
git checkout -f {branch}
git fetch
git reset --hard @{{u}}
""")
else:
returncode = subprocess_with_log(f"""
git clone --branch {branch} --single-branch {repository} "{targetdir}"
""")

if returncode == 0:
return
if returncode == 0:
return

sleep_time = sleep_time_unit * attempt
build_utils.print_warning(f"""Attempt {attempt}: failed to pull/clone branch. Retrying in {sleep_time} seconds...""")
build_utils.print_warning(f"""Attempt {attempt}: failed to pull/clone branch or copy it. Retrying in {sleep_time} seconds...""")
time.sleep(sleep_time)

if returncode != 0:
Expand Down Expand Up @@ -580,7 +593,7 @@ def get_stdout_subprocess(command: str, error_message: str) -> str:
return string_result


@github_log_group("Rebase")
@github_log_group("Get base head SHA")
def get_base_head_sha(directory: str, repository: str, merge_sha: str, head_sha: str) -> str:
"""
get_base_head_sha
Expand Down
Loading