Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

stabilize ci_rustc_if_unchanged_logic test for local environments #138245

Merged
merged 1 commit into from
Mar 12, 2025
Merged

stabilize ci_rustc_if_unchanged_logic test for local environments #138245

merged 1 commit into from
Mar 12, 2025
+11 −2

Conversation

onur-ozkan
Copy link
Member

Fixes #138239

@rustbot
Copy link
Collaborator

rustbot commented Mar 8, 2025

r? @Kobzol

rustbot has assigned @Kobzol.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 8, 2025
@onur-ozkan onur-ozkan mentioned this pull request Mar 8, 2025
Closed
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@onur-ozkan onur-ozkan force-pushed the ci-rustc-test-fix branch 3 times, most recently from e441c97 to 5c1c83c Compare March 8, 2025 22:56
jieyouxu
jieyouxu approved these changes Mar 9, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, the test fix LGTM. I have one suggestion re. how to make this test less likely to diverge in the future.

@jieyouxu jieyouxu assigned jieyouxu and unassigned Kobzol Mar 9, 2025
@jieyouxu
Copy link
Member

jieyouxu commented Mar 9, 2025

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 9, 2025
@onur-ozkan
stabilize ci_rustc_if_unchanged_logic test for local environments
bf58a35 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rustbot
Copy link
Collaborator

rustbot commented Mar 10, 2025

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@onur-ozkan
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 10, 2025
@jieyouxu
Copy link
Member

Thanks!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 10, 2025

📌 Commit bf58a35 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2025
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 10, 2025
@jieyouxu
Rollup merge of rust-lang#138245 - onur-ozkan:ci-rustc-test-fix, r=ji…
19b5d58 
…eyouxu

stabilize `ci_rustc_if_unchanged_logic` test for local environments

Fixes rust-lang#138239
@jieyouxu jieyouxu mentioned this pull request Mar 10, 2025
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 10, 2025
@jieyouxu
Rollup merge of rust-lang#138245 - onur-ozkan:ci-rustc-test-fix, r=ji…
f6b7134 
…eyouxu

stabilize `ci_rustc_if_unchanged_logic` test for local environments

Fixes rust-lang#138239
@jieyouxu jieyouxu mentioned this pull request Mar 10, 2025
Closed
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 11, 2025
@jieyouxu
Rollup merge of rust-lang#138245 - onur-ozkan:ci-rustc-test-fix, r=ji…
c376c91 
…eyouxu

stabilize `ci_rustc_if_unchanged_logic` test for local environments

Fixes rust-lang#138239
@jieyouxu jieyouxu mentioned this pull request Mar 11, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2025
@bors
Auto merge of rust-lang#138326 - jieyouxu:rollup-8p6psb1, r=jieyouxu
34d481e 
Rollup of 16 pull requests

Successful merges:

 - rust-lang#126856 (remove deprecated tool `rls`)
 - rust-lang#136932 (Reduce formatting `width` and `precision` to 16 bits)
 - rust-lang#137314 (change definitely unproductive cycles to error)
 - rust-lang#137612 (Update bootstrap to edition 2024)
 - rust-lang#138002 (Disable CFI for weakly linked syscalls)
 - rust-lang#138052 (strip `-Wlinker-messages` wrappers from `rust-lld` rmake test)
 - rust-lang#138063 (Improve `-Zunpretty=hir` for parsed attrs)
 - rust-lang#138109 (make precise capturing args in rustdoc Json typed)
 - rust-lang#138147 (Add maintainers for powerpc64le-unknown-linux-gnu)
 - rust-lang#138245 (stabilize `ci_rustc_if_unchanged_logic` test for local environments)
 - rust-lang#138296 (Remove `AdtFlags::IS_ANONYMOUS` and `Copy`/`Clone` condition for anonymous ADT)
 - rust-lang#138300 (add tracking issue for unqualified_local_imports)
 - rust-lang#138307 (Allow specifying glob patterns for try jobs)
 - rust-lang#138313 (Update books)
 - rust-lang#138315 (use next_back() instead of last() on DoubleEndedIterator)
 - rust-lang#138318 (Rustdoc: remove a bunch of `@ts-expect-error` from main.js)

r? `@ghost`
`@rustbot` modify labels: rollup
jieyouxu added a commit to jieyouxu/rust that referenced this pull request Mar 11, 2025
@jieyouxu
Rollup merge of rust-lang#138245 - onur-ozkan:ci-rustc-test-fix, r=ji…
752acaa 
…eyouxu

stabilize `ci_rustc_if_unchanged_logic` test for local environments

Fixes rust-lang#138239
@jieyouxu jieyouxu mentioned this pull request Mar 11, 2025
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2025
@bors
Auto merge of rust-lang#138337 - jieyouxu:rollup-bcp7xvg, r=jieyouxu
8e3b6f6 
Rollup of 18 pull requests

Successful merges:

 - rust-lang#126856 (remove deprecated tool `rls`)
 - rust-lang#137314 (change definitely unproductive cycles to error)
 - rust-lang#137504 (Move methods from Map to TyCtxt, part 4.)
 - rust-lang#137701 (Convert `ShardedHashMap` to use `hashbrown::HashTable`)
 - rust-lang#137967 ([AIX] Fix hangs during testing)
 - rust-lang#138002 (Disable CFI for weakly linked syscalls)
 - rust-lang#138052 (strip `-Wlinker-messages` wrappers from `rust-lld` rmake test)
 - rust-lang#138063 (Improve `-Zunpretty=hir` for parsed attrs)
 - rust-lang#138109 (make precise capturing args in rustdoc Json typed)
 - rust-lang#138147 (Add maintainers for powerpc64le-unknown-linux-gnu)
 - rust-lang#138245 (stabilize `ci_rustc_if_unchanged_logic` test for local environments)
 - rust-lang#138296 (Remove `AdtFlags::IS_ANONYMOUS` and `Copy`/`Clone` condition for anonymous ADT)
 - rust-lang#138300 (add tracking issue for unqualified_local_imports)
 - rust-lang#138307 (Allow specifying glob patterns for try jobs)
 - rust-lang#138313 (Update books)
 - rust-lang#138315 (use next_back() instead of last() on DoubleEndedIterator)
 - rust-lang#138318 (Rustdoc: remove a bunch of `@ts-expect-error` from main.js)
 - rust-lang#138330 (Remove unnecessary `[lints.rust]` sections.)

Failed merges:

 - rust-lang#137147 (Add exclude to config.toml)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 11, 2025
@matthiaskrgr
Rollup merge of rust-lang#138245 - onur-ozkan:ci-rustc-test-fix, r=ji…
29d662d 
…eyouxu

stabilize `ci_rustc_if_unchanged_logic` test for local environments

Fixes rust-lang#138239
This was referenced Mar 11, 2025
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2025
@bors
Auto merge of rust-lang#138366 - matthiaskrgr:rollup-cn16m7q, r=matth…
c625102 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#137715 (Allow int literals for pattern types with int base types)
 - rust-lang#138002 (Disable CFI for weakly linked syscalls)
 - rust-lang#138051 (Add support for downloading GCC from CI)
 - rust-lang#138231 (Prevent ICE in autodiff validation by emitting user-friendly errors)
 - rust-lang#138245 (stabilize `ci_rustc_if_unchanged_logic` test for local environments)
 - rust-lang#138256 (Do not feed anon const a type that references generics that it does not have)
 - rust-lang#138284 (Do not write user type annotation for const param value path)
 - rust-lang#138296 (Remove `AdtFlags::IS_ANONYMOUS` and `Copy`/`Clone` condition for anonymous ADT)
 - rust-lang#138352 (miri native_calls: ensure we actually expose *mutable* provenance to the memory FFI can access)
 - rust-lang#138354 (remove redundant `body`  arguments)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 55abd7f into rust-lang:master Mar 12, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 12, 2025
@onur-ozkan onur-ozkan deleted the ci-rustc-test-fix branch March 12, 2025 06:11
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Mar 14, 2025
@bors
Auto merge of rust-lang#138366 - matthiaskrgr:rollup-cn16m7q, r=matth…
7d08159 
…iaskrgr

Rollup of 10 pull requests

Successful merges:

 - rust-lang#137715 (Allow int literals for pattern types with int base types)
 - rust-lang#138002 (Disable CFI for weakly linked syscalls)
 - rust-lang#138051 (Add support for downloading GCC from CI)
 - rust-lang#138231 (Prevent ICE in autodiff validation by emitting user-friendly errors)
 - rust-lang#138245 (stabilize `ci_rustc_if_unchanged_logic` test for local environments)
 - rust-lang#138256 (Do not feed anon const a type that references generics that it does not have)
 - rust-lang#138284 (Do not write user type annotation for const param value path)
 - rust-lang#138296 (Remove `AdtFlags::IS_ANONYMOUS` and `Copy`/`Clone` condition for anonymous ADT)
 - rust-lang#138352 (miri native_calls: ensure we actually expose *mutable* provenance to the memory FFI can access)
 - rust-lang#138354 (remove redundant `body`  arguments)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@jieyouxu jieyouxu

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.

Bootstrap test ci_rustc_if_unchanged_logic fails locally
6 participants
@onur-ozkan @rustbot @rust-log-analyzer @jieyouxu @bors @Kobzol