Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #138245 - onur-ozkan:ci-rustc-test-fix, r=jieyouxu

Browse Source 
stabilize `ci_rustc_if_unchanged_logic` test for local environments

Fixes #138239
This commit is contained in:
Matthias Krüger
2025-03-11 19:35:31 +01:00
committed by GitHub
parent caa2d008f9 bf58a3521f
commit 55abd7fc82
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bootstrap/src/core/builder/tests.rs
+8 -2
View File
@@ -261,8 +261,14 @@ fn ci_rustc_if_unchanged_logic() {
// Make sure "if-unchanged" logic doesn't try to use CI rustc while there are changes
// in compiler and/or library.
if config.download_rustc_commit.is_some() {
let has_changes =
config.last_modified_commit(&["compiler", "library"], "download-rustc", true).is_none();
let mut paths = vec!["compiler"];
// Handle library tree the same way as in `Config::download_ci_rustc_commit`.
if build_helper::ci::CiEnv::is_ci() {
paths.push("library");
}
let has_changes = config.last_modified_commit(&paths, "download-rustc", true).is_none();
assert!(
!has_changes,
src/bootstrap/src/core/config/config.rs
+3
View File
@@ -3018,6 +3018,9 @@ fn download_ci_rustc_commit(
// these changes to speed up the build process for library developers. This provides consistent
// functionality for library developers between `download-rustc=true` and `download-rustc="if-unchanged"`
// options.
//
// If you update "library" logic here, update `builder::tests::ci_rustc_if_unchanged_logic` test
// logic accordingly.
if !CiEnv::is_ci() {
allowed_paths.push(":!library");
}