From c5aa8fb8c502e8be18ad92fc4d2c68ead4f3db3a Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 10 Jul 2023 10:41:30 -0400 Subject: Bump channel to beta --- src/ci/channel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/ci/channel b/src/ci/channel index bf867e0ae5b..65b2df87f7d 100644 --- a/src/ci/channel +++ b/src/ci/channel @@ -1 +1 @@ -nightly +beta -- cgit 1.4.1-3-g733a5 From 27ff8191989ff67c9e07f062d42a6ca1d1e42720 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Mon, 10 Jul 2023 15:07:20 -0400 Subject: Use channel name in artifact -- fixes beta builds This likely will break on stable promotion because stable artifacts are named with stable version rather than channel name; we'll want to figure out the right fix for that in a follow-up. --- src/ci/stage-build.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ci/stage-build.py b/src/ci/stage-build.py index 8640a3e0f34..bdf562f1354 100755 --- a/src/ci/stage-build.py +++ b/src/ci/stage-build.py @@ -22,6 +22,7 @@ from typing import Callable, ContextManager, Dict, Iterable, Iterator, List, Opt Tuple, Union PGO_HOST = os.environ["PGO_HOST"] +CHANNEL = os.environ["RUST_RELEASE_CHANNEL"] LOGGER = logging.getLogger("stage-build") @@ -816,10 +817,10 @@ def run_tests(pipeline: Pipeline): return extracted_path # Extract rustc, libstd, cargo and src archives to create the optimized sysroot - rustc_dir = extract_dist_dir(f"rustc-nightly-{PGO_HOST}") / "rustc" - libstd_dir = extract_dist_dir(f"rust-std-nightly-{PGO_HOST}") / f"rust-std-{PGO_HOST}" - cargo_dir = extract_dist_dir(f"cargo-nightly-{PGO_HOST}") / "cargo" - extracted_src_dir = extract_dist_dir("rust-src-nightly") / "rust-src" + rustc_dir = extract_dist_dir(f"rustc-{CHANNEL}-{PGO_HOST}") / "rustc" + libstd_dir = extract_dist_dir(f"rust-std-{CHANNEL}-{PGO_HOST}") / f"rust-std-{PGO_HOST}" + cargo_dir = extract_dist_dir(f"cargo-{CHANNEL}-{PGO_HOST}") / "cargo" + extracted_src_dir = extract_dist_dir(f"rust-src-{CHANNEL}") / "rust-src" # We need to manually copy libstd to the extracted rustc sysroot shutil.copytree( @@ -827,7 +828,7 @@ def run_tests(pipeline: Pipeline): rustc_dir / "lib" / "rustlib" / PGO_HOST / "lib" ) - # Extract sources - they aren't in the `rustc-nightly-{host}` tarball, so we need to manually copy libstd + # Extract sources - they aren't in the `rustc-{CHANNEL}-{host}` tarball, so we need to manually copy libstd # sources to the extracted sysroot. We need sources available so that `-Zsimulate-remapped-rust-src-base` # works correctly. shutil.copytree( -- cgit 1.4.1-3-g733a5