diff --git a/.github/workflows/root-ci-config/build_root.py b/.github/workflows/root-ci-config/build_root.py index 7ae789e70baf6..62ccfbf6e08c2 100755 --- a/.github/workflows/root-ci-config/build_root.py +++ b/.github/workflows/root-ci-config/build_root.py @@ -319,7 +319,7 @@ def git_pull(directory: str, repository: str, branch: str): cd '{targetdir}' git checkout {branch} git fetch - git reset --hard @{{u}} + git reset --hard '@{{u}}' """) else: returncode = subprocess_with_log(f""" diff --git a/.github/workflows/root-ci-config/build_utils.py b/.github/workflows/root-ci-config/build_utils.py index 5ace08990c732..a9a7383a50b28 100755 --- a/.github/workflows/root-ci-config/build_utils.py +++ b/.github/workflows/root-ci-config/build_utils.py @@ -312,8 +312,13 @@ def download_file(url: str, dest: str) -> None: if not os.path.exists(parent_dir): os.makedirs(parent_dir) - with open(dest, 'wb') as fout, get(url, timeout=300) as req: - fout.write(req.content) + # We need to download in chunks for 32 bits platforms and payloads + # larger than 4 GB + with get(url, timeout=300, stream=True) as req: + req.raise_for_status() + with open(dest, 'wb') as fout: + for chunk in req.iter_content(chunk_size=1 << 20): + fout.write(chunk) def download_latest(url: str, prefix: str, destination: str) -> str: diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 0fae71f9d7bdd..3f2ecc76b40e9 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -306,7 +306,7 @@ jobs: python .github/workflows/root-ci-config/build_root.py --buildtype ${{ matrix.config }} --platform windows10 - --incremental $INCREMENTAL + --incremental %INCREMENTAL% --base_ref ${{ github.base_ref }} --sha ${{ github.sha }} --pull_repository ${{ github.event.pull_request.head.repo.clone_url }}