diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-08-26 14:19:19 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-26 14:19:19 +1000 |
| commit | 6c310bab917e327710dfa41b6cde2f59c4b216ce (patch) | |
| tree | d8ae2b58f0393a949ab7ab217e4e997f720f8f64 | |
| parent | f5633098b030ba24ae25b4e7cec318cbb5782592 (diff) | |
| parent | cce9479abd78695d28e3dfe255ce77d79d5aac04 (diff) | |
| download | rust-6c310bab917e327710dfa41b6cde2f59c4b216ce.tar.gz rust-6c310bab917e327710dfa41b6cde2f59c4b216ce.zip | |
Rollup merge of #145815 - jieyouxu:pr-check-timeout, r=marcoieni
Wait for DPkg frontend lock when trying to remove packages Hopefully this helps with [#t-infra > pr-check-1 fails on "free up disk space"](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/pr-check-1.20fails.20on.20.22free.20up.20disk.20space.22/with/535794424). As suggested by riking in [#t-infra > pr-check-1 fails on "free up disk space" @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/242791-t-infra/topic/pr-check-1.20fails.20on.20.22free.20up.20disk.20space.22/near/535791579), thanks! r? infra-ci
| -rwxr-xr-x | src/ci/scripts/free-disk-space-linux.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/ci/scripts/free-disk-space-linux.sh b/src/ci/scripts/free-disk-space-linux.sh index 32649fe0d9b..ac3c9cfb28b 100755 --- a/src/ci/scripts/free-disk-space-linux.sh +++ b/src/ci/scripts/free-disk-space-linux.sh @@ -221,10 +221,13 @@ cleanPackages() { ) fi - sudo apt-get -qq remove -y --fix-missing "${packages[@]}" + WAIT_DPKG_LOCK="-o DPkg::Lock::Timeout=60" + sudo apt-get ${WAIT_DPKG_LOCK} -qq remove -y --fix-missing "${packages[@]}" - sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed" - sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed failed" + sudo apt-get ${WAIT_DPKG_LOCK} autoremove -y \ + || echo "::warning::The command [sudo apt-get autoremove -y] failed" + sudo apt-get ${WAIT_DPKG_LOCK} clean \ + || echo "::warning::The command [sudo apt-get clean] failed" } # Remove Docker images. |