aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Haarman <inglorion@chromium.org>2024-02-16 16:11:28 +0000
committerChromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com>2024-02-20 16:17:57 +0000
commitebfdad7a5177b9f2a3389d6b26e61dcc5908b922 (patch)
treea47fcf8ba89bd644be1e2a03b86e82ce557618e6
parent9bff7a7c2e13b3058618a55d1f5934a5206ffe9f (diff)
downloadtoolchain-utils-ebfdad7a5177b9f2a3389d6b26e61dcc5908b922.tar.gz
rust_uprev: remove code for rust-artifacts
rust-artifacts no longer exists, so remove the code from rust_uprev that deals with it. The Manifest that used to live in rust-artifacts now lives in rust-host, so update rust_uprev accordingly. BUG=b:297387332 TEST=create a rust uprev with the new code Change-Id: If0a315d19eac31ce3a7d6b3e309ce2c80e5eff91 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/toolchain-utils/+/5300550 Reviewed-by: George Burgess <gbiv@chromium.org> Commit-Queue: Bob Haarman <inglorion@chromium.org> Tested-by: Bob Haarman <inglorion@chromium.org>
-rwxr-xr-xrust_tools/rust_uprev.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/rust_tools/rust_uprev.py b/rust_tools/rust_uprev.py
index c8f0f784..ee956137 100755
--- a/rust_tools/rust_uprev.py
+++ b/rust_tools/rust_uprev.py
@@ -113,7 +113,6 @@ RUST_SIGNING_KEY = "85AB96E6FA1BE5FE"
RUST_SRC_BASE_URI = "https://static.rust-lang.org/dist/"
# Packages that need to be processed like dev-lang/rust.
RUST_PACKAGES = (
- ("dev-lang", "rust-artifacts"),
("dev-lang", "rust-host"),
("dev-lang", "rust"),
)
@@ -833,8 +832,8 @@ def create_rust_uprev(
)
run_step(
- "update dev-lang/rust-artifacts manifest to add new version",
- lambda: ebuild_actions("dev-lang/rust-artifacts", ["manifest"]),
+ "update dev-lang/rust-host manifest to add new version",
+ lambda: ebuild_actions("dev-lang/rust-host", ["manifest"]),
)
run_step(
@@ -856,8 +855,8 @@ def create_rust_uprev(
lambda: set_include_profdata_src(CROS_RUSTC_ECLASS, include=True),
)
run_step(
- "update dev-lang/rust-artifacts manifest to add profile data",
- lambda: ebuild_actions("dev-lang/rust-artifacts", ["manifest"]),
+ "update dev-lang/rust-host manifest to add profile data",
+ lambda: ebuild_actions("dev-lang/rust-host", ["manifest"]),
)
if not skip_compile:
run_step("build packages", lambda: rebuild_packages(rust_version))
@@ -994,8 +993,8 @@ def remove_rust_uprev(
)
run_step(
- "update dev-lang/rust-artifacts manifest to delete old version",
- lambda: ebuild_actions("dev-lang/rust-artifacts", ["manifest"]),
+ "update dev-lang/rust-host manifest to delete old version",
+ lambda: ebuild_actions("dev-lang/rust-host", ["manifest"]),
)
run_step(
"remove target version from rust packages",