diff options
| author | George Burgess IV <gbiv@google.com> | 2023-12-13 13:13:10 -0700 |
|---|---|---|
| committer | Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> | 2023-12-13 23:49:00 +0000 |
| commit | aaf2973ff3a53c2cf5be2c3dd37e09c8afb75574 (patch) | |
| tree | 0b4c52734b8576dabe10f661ac584d16e4190f9a /rust_tools/auto_update_rust_bootstrap.py | |
| parent | 11af312a899495a4e120bd121fd264125e2ffc57 (diff) | |
| download | toolchain-utils-aaf2973ff3a53c2cf5be2c3dd37e09c8afb75574.tar.gz | |
auto_update_rust_bootstrap: cosmetic bugfixes
1. The `core.hooksPath` message here was debugging code that I forgot to
remove.
2. crrev.com/c/5120506's PS1 subject shouldn't have included rust's
current revision number.
BUG=b:309950482
TEST=Preuploads
Change-Id: I03643f422d2eb963f5ac210cbb94e9206a6845db
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/5120403
Reviewed-by: Bob Haarman <inglorion@chromium.org>
Tested-by: George Burgess <gbiv@chromium.org>
Commit-Queue: George Burgess <gbiv@chromium.org>
Diffstat (limited to 'rust_tools/auto_update_rust_bootstrap.py')
| -rwxr-xr-x | rust_tools/auto_update_rust_bootstrap.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/rust_tools/auto_update_rust_bootstrap.py b/rust_tools/auto_update_rust_bootstrap.py index ab2a07bf..759d6bbc 100755 --- a/rust_tools/auto_update_rust_bootstrap.py +++ b/rust_tools/auto_update_rust_bootstrap.py @@ -370,12 +370,6 @@ def commit_all_changes( stdin=subprocess.DEVNULL, ) subprocess.run( - ["git", "config", "core.hooksPath"], - cwd=git_dir, - check=True, - stdin=subprocess.DEVNULL, - ) - subprocess.run( ["git", "commit", "-m", commit_message], cwd=git_dir, check=True, @@ -604,15 +598,16 @@ def maybe_add_new_rust_bootstrap_version( update_ebuild_manifest(new_ebuild) if commit: + newest_no_rev = newest_rust_version.without_rev() commit_all_changes( chromiumos_overlay, rust_bootstrap_dir, commit_message=textwrap.dedent( f"""\ - rust-bootstrap: add version {newest_rust_version} + rust-bootstrap: add version {newest_no_rev} - Rust is now at {newest_rust_version.without_rev()}; add a - rust-bootstrap version so prebuilts can be generated early. + Rust is now at {newest_no_rev}; add a rust-bootstrap version so + prebuilts can be generated early. BUG={TRACKING_BUG} TEST=CQ |