diff options
| author | Mark Simulacrum <mark.simulacrum@gmail.com> | 2017-05-24 19:50:11 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 19:50:11 -0600 |
| commit | d429b495a4bfba26d2c18fd9e140e17a787538d8 (patch) | |
| tree | a2215e4dd219883e96acebbdcc24257c99d79133 | |
| parent | 2bca4fa47d2db220186f32acad4d70bcb4331054 (diff) | |
| parent | 47f8b4a3d8e80ca88912aa10954685b300565a90 (diff) | |
| download | rust-d429b495a4bfba26d2c18fd9e140e17a787538d8.tar.gz rust-d429b495a4bfba26d2c18fd9e140e17a787538d8.zip | |
Rollup merge of #42211 - aidanhs:aphs-llvm-clone-hacks, r=Mark-Simulacrum
Hack around abysmally slow llvm clones r? @Mark-Simulacrum (don't r+ yet, let's see what travis says)
| -rwxr-xr-x | src/ci/init_repo.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/ci/init_repo.sh b/src/ci/init_repo.sh index 1db2135eb6d..0a17bd3b571 100755 --- a/src/ci/init_repo.sh +++ b/src/ci/init_repo.sh @@ -64,6 +64,7 @@ if [ ! -d "$cache_src_dir/.git" ]; then git clone https://github.com/rust-lang/rust.git $cache_src_dir" fi retry sh -c "cd $cache_src_dir && git reset --hard && git pull" +(cd $cache_src_dir && git rm src/llvm) retry sh -c "cd $cache_src_dir && \ git submodule deinit -f . && git submodule sync && git submodule update --init" @@ -76,6 +77,15 @@ touch "$cache_valid_file" # http://stackoverflow.com/questions/12641469/list-submodules-in-a-git-repository modules="$(git config --file .gitmodules --get-regexp '\.path$' | cut -d' ' -f2)" for module in $modules; do + if [ "$module" = src/llvm ]; then + commit="$(git ls-tree HEAD src/llvm | awk '{print $3}')" + git rm src/llvm + curl -sSL -O "https://github.com/rust-lang/llvm/archive/$commit.tar.gz" + tar -C src/ -xf "$commit.tar.gz" + rm "$commit.tar.gz" + mv "src/llvm-$commit" src/llvm + continue + fi if [ ! -d "$cache_src_dir/$module" ]; then echo "WARNING: $module not found in pristine repo" retry sh -c "git submodule deinit -f $module && git submodule update --init $module" |
