Fix paths when downloading Rustup artifacts

Author: jdno

local/rustup.sh

@@ -8,7 +8,7 @@ set -euo pipefail
 IFS=$'\n\t'
 
 RUSTUP_REPO="https://github.com/rust-lang/rustup"
-RUSTUP_DEFAULT_BRANCH="master"
+RUSTUP_DEFAULT_BRANCH="stable"
 
 # S3 bucket from which to download the Rustup artifacts
 S3_BUCKET="rustup-builds"
@@ -19,6 +19,7 @@ DOWNLOAD_BASE="https://rustup-builds.rust-lang.org"
 # The artifacts for the following targets will be downloaded and copied during
 # the release process. At least one target is required.
 DOWNLOAD_TARGETS=(
+    "aarch64-unknown-linux-gnu"
     "x86_64-unknown-linux-gnu"
 )
 
@@ -42,12 +43,14 @@ else
 fi
 
 for target in "${DOWNLOAD_TARGETS[@]}"; do
-  if ! mc stat "local/artifacts/builds/${commit}/dist/${target}" >/dev/null 2>&1; then
+  if ! mc stat "local/rustup-builds/${commit}/dist/${target}" >/dev/null 2>&1; then
     echo "==> copying ${target} from S3"
 
         for file in "${DOWNLOAD_FILES[@]}"; do
+            echo "==> copying ${file} from S3"
+
             if curl -Lo /tmp/component "${DOWNLOAD_BASE}/${commit}/dist/${target}/${file}" --fail; then
-                mc cp /tmp/component "local/artifacts/builds/${commit}/dist/${target}/${file}" >/dev/null
+                mc cp /tmp/component "local/rustup-builds/${commit}/dist/${target}/${file}" >/dev/null
             fi
         done
     else
@@ -78,7 +81,7 @@ export PROMOTE_RELEASE_CHANNEL="${channel}"
 export PROMOTE_RELEASE_CLOUDFRONT_DOC_ID=""
 export PROMOTE_RELEASE_CLOUDFRONT_STATIC_ID=""
 export PROMOTE_RELEASE_DOWNLOAD_BUCKET="rustup-builds"
-export PROMOTE_RELEASE_DOWNLOAD_DIR="builds"
+export PROMOTE_RELEASE_DOWNLOAD_DIR=""
 export PROMOTE_RELEASE_GPG_KEY_FILE=""
 export PROMOTE_RELEASE_GPG_PASSWORD_FILE=""
 export PROMOTE_RELEASE_UPLOAD_ADDR=""

src/rustup.rs

@@ -142,21 +142,24 @@ impl Context {
     }
 
     fn download_rustup_artifacts(&mut self, sha: &str) -> Result<PathBuf, Error> {
-        println!("Downloading artifacts from dev-static...");
+        println!(
+            "Downloading artifacts from {}...",
+            self.config.download_bucket
+        );
 
-        let dl = self.dl_dir().join("dist");
+        let dl = self.dl_dir().join("rustup");
         // Remove the directory if it exists, otherwise just ignore.
         let _ = fs::remove_dir_all(&dl);
         fs::create_dir_all(&dl)?;
 
-        let download_path = format!("{}/{}", self.config.download_dir, sha);
+        let artifacts_url = format!("s3://{}/{}", self.config.download_bucket, sha);
 
         run(self
             .aws_s3()
             .arg("cp")
             .arg("--recursive")
             .arg("--only-show-errors")
-            .arg(self.s3_artifacts_url(&download_path))
+            .arg(artifacts_url)
             .arg(format!("{}/", dl.display())))?;
 
         Ok(dl)