about summary refs log tree commit diff
path: root/src/ci/docker
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-03 19:39:28 +0000
committerbors <bors@rust-lang.org>2022-07-03 19:39:28 +0000
commit495b216696ccbc27c73d6bdc486bf4621d610f4b (patch)
tree42faa70885016dd5dafd77521f006cb059679d67 /src/ci/docker
parent0e21a27075a8c508f00d1a4430497f17ce93d5c9 (diff)
parent124557c05d25e4f7f6a4f549816e9be012e46d57 (diff)
downloadrust-495b216696ccbc27c73d6bdc486bf4621d610f4b.tar.gz
rust-495b216696ccbc27c73d6bdc486bf4621d610f4b.zip
Auto merge of #98439 - ehuss:cleanup-ci-script, r=Mark-Simulacrum
Clean up submodule checkout scripts

This is just some small cleanup:

* Removed unused CACHE_DIR stuff
* Removed duplicate fetch_github_commit_archive function which is no longer used
* Combined init_repo.sh and checkout-submodules.sh, as checkout-submodules.sh was doing nothing but calling init_repo.sh
Diffstat (limited to 'src/ci/docker')
-rw-r--r--src/ci/docker/host-x86_64/dist-various-2/shared.sh12
1 files changed, 0 insertions, 12 deletions
diff --git a/src/ci/docker/host-x86_64/dist-various-2/shared.sh b/src/ci/docker/host-x86_64/dist-various-2/shared.sh
index 267d8b79cc2..291f26bdaeb 100644
--- a/src/ci/docker/host-x86_64/dist-various-2/shared.sh
+++ b/src/ci/docker/host-x86_64/dist-various-2/shared.sh
@@ -33,15 +33,3 @@ function retry {
     }
   done
 }
-
-# Copied from ../../init_repo.sh
-function fetch_github_commit_archive {
-    local module=$1
-    local cached="download-${module//\//-}.tar.gz"
-    retry sh -c "rm -f $cached && \
-        curl -f -sSL -o $cached $2"
-    mkdir $module
-    touch "$module/.git"
-    tar -C $module --strip-components=1 -xf $cached
-    rm $cached
-}