Skip to content

Commit 6717b36

Browse files
authored
Rollup merge of rust-lang#90122 - rusticstuff:ci_curl_max_time, r=Mark-Simulacrum
CI: make docker cache download attempt time out after 10 minutes Might help to prevent timeouts we have been seeing: * https://github.com/rust-lang-ci/rust/runs/3946294286?check_suite_focus=true#step:25:23 * https://github.com/rust-lang-ci/rust/runs/3956799200?check_suite_focus=true#step:25:22
2 parents 6152de0 + 838e673 commit 6717b36

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/ci/docker/run.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,9 @@ if [ -f "$docker_dir/$image/Dockerfile" ]; then
7070
echo "Attempting to download $url"
7171
rm -f /tmp/rustci_docker_cache
7272
set +e
73-
retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache "$url"
73+
retry curl --max-time 600 -y 30 -Y 10 --connect-timeout 30 -f -L -C - \
74+
-o /tmp/rustci_docker_cache "$url"
75+
echo "Loading images into docker"
7476
loaded_images=$(docker load -i /tmp/rustci_docker_cache | sed 's/.* sha/sha/')
7577
set -e
7678
echo "Downloaded containers:\n$loaded_images"

0 commit comments

Comments
 (0)