echo "Attempting to download $url"
rm -f /tmp/rustci_docker_cache
set +e
- retry curl -y 30 -Y 10 --connect-timeout 30 -f -L -C - -o /tmp/rustci_docker_cache "$url"
+ retry curl --max-time 600 -y 30 -Y 10 --connect-timeout 30 -f -L -C - \
+ -o /tmp/rustci_docker_cache "$url"
+ echo "Loading images into docker"
loaded_images=$(docker load -i /tmp/rustci_docker_cache | sed 's/.* sha/sha/')
set -e
echo "Downloaded containers:\n$loaded_images"
fi
if [ "$CI" != "" ]; then
- # Get some needed information for $BASE_COMMIT
- git fetch "https://github.com/$GITHUB_REPOSITORY" "$GITHUB_BASE_REF"
- BASE_COMMIT="$(git merge-base FETCH_HEAD HEAD)"
+ # Get some needed information for $BASE_COMMIT
+ #
+ # This command gets the last merge commit which we'll use as base to list
+ # deleted files since then.
+ BASE_COMMIT="$(git log --author=bors@rust-lang.org -n 2 --pretty=format:%H | tail -n 1)"
else
- BASE_COMMIT=""
+ BASE_COMMIT=""
fi
docker \