Skip to content

Commit 1d23e98

Browse files
chbaker0Aravind Vasudevan
authored andcommitted
Fall back to last working Rust build
A recent Clang roll did not produce a working Rust package. There are two bugs blocking a Rust roll to fix the issue. In the meantime, fall back to the last package. Additionally, this changes update_rust.py to handle when the version stamp in the existing Rust package does not have the expected format. In this case it will always download and unpack a new package. Bug: 1379429, 1377429 Change-Id: I6dbbabedc710ea06d964206d4e0b6b1c6b8afac4 Cq-Include-Trybots: luci.chromium.try:android-rust-arm-dbg,android-rust-arm-rel,linux-rust-x64-dbg,linux-rust-x64-rel Change-Id: I6dbbabedc710ea06d964206d4e0b6b1c6b8afac4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3999834 Reviewed-by: Nico Weber <thakis@chromium.org> Commit-Queue: Collin Baker <collinbaker@chromium.org> Commit-Queue: Nico Weber <thakis@chromium.org> Auto-Submit: Collin Baker <collinbaker@chromium.org> Cr-Commit-Position: refs/heads/main@{#1066727} NOKEYCHECK=True GitOrigin-RevId: 152639d5b6935f508051ffd456a3225de5dbdf86
1 parent ca3b661 commit 1d23e98

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

update_rust.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
# This should almost always be None. When a breakage happens the fallback should
4646
# be temporary. Once fixed, the applicable revision(s) above should be updated
4747
# and FALLBACK_CLANG_VERSION should be reset to None.
48-
FALLBACK_CLANG_VERSION = None
48+
FALLBACK_CLANG_VERSION = 'llvmorg-16-init-8697-g60809cd2-1'
4949

5050
# Hash of src/stage0.json, which itself contains the stage0 toolchain hashes.
5151
# We trust the Rust build system checks, but to ensure it is not tampered with
@@ -91,7 +91,10 @@ def GetStampVersion():
9191
with open(VERSION_STAMP_PATH) as version_file:
9292
existing_stamp = version_file.readline().rstrip()
9393
version_re = re.compile(r'rustc [0-9.]+-dev \((.+?) chromium\)')
94-
return version_re.fullmatch(existing_stamp).group(1)
94+
match = version_re.fullmatch(existing_stamp)
95+
if match is None:
96+
return None
97+
return match.group(1)
9598

9699
return None
97100

0 commit comments

Comments
 (0)