From 2dc650b97b240c0bd279704b01916970c2031c4b Mon Sep 17 00:00:00 2001
From: bit-aloo <sshourya17@gmail.com>
Date: Fri, 28 Mar 2025 18:12:29 +0530
Subject: [PATCH] replace commit placeholder in vendor status with actual
commit
---
src/bootstrap/bootstrap.py | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 68400ba0ea029..140f601253c31 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -1162,6 +1162,30 @@ def build_triple(self):
config = self.get_toml("build")
return config or default_build_triple(self.verbose)
+ def is_git_repository(self, repo_path):
+ return os.path.isdir(os.path.join(repo_path, ".git"))
+
+ def get_latest_commit(self):
+ repo_path = self.rust_root
+ author_email = self.stage0_data.get("git_merge_commit_email")
+ if not self.is_git_repository(repo_path):
+ return "<commit>"
+ cmd = [
+ "git",
+ "-C",
+ repo_path,
+ "rev-list",
+ "--author",
+ author_email,
+ "-n1",
+ "HEAD",
+ ]
+ try:
+ commit = subprocess.check_output(cmd, universal_newlines=True).strip()
+ return commit or "<commit>"
+ except subprocess.CalledProcessError:
+ return "<commit>"
+
def check_vendored_status(self):
"""Check that vendoring is configured properly"""
# keep this consistent with the equivalent check in bootstrap:
@@ -1174,7 +1198,8 @@ def check_vendored_status(self):
eprint(" use vendored sources by default.")
cargo_dir = os.path.join(self.rust_root, ".cargo")
- url = "https://ci-artifacts.rust-lang.org/rustc-builds/<commit>/rustc-nightly-src.tar.xz"
+ commit = self.get_latest_commit()
+ url = f"https://ci-artifacts.rust-lang.org/rustc-builds/{commit}/rustc-nightly-src.tar.xz"
if self.use_vendored_sources:
vendor_dir = os.path.join(self.rust_root, "vendor")
if not os.path.exists(vendor_dir):