Skip to content

Remove usage of compiletest-use-stage0-libtest from CI #147188

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
Merged
merged 2 commits into from
Oct 1, 2025
Merged

Remove usage of compiletest-use-stage0-libtest from CI #147188

merged 2 commits into from
Oct 1, 2025
+1 −8

Conversation

Kobzol
Copy link
Member

@Kobzol Kobzol commented Sep 30, 2025

It shouldn't be needed anymore after #146929.

r? @Zalathar

@rustbot
Copy link
Collaborator

rustbot commented Sep 30, 2025

This PR modifies src/bootstrap/defaults.

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

@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc labels Sep 30, 2025
@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) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Sep 30, 2025
Zalathar
Zalathar reviewed Oct 1, 2025
View reviewed changes
src/bootstrap/defaults/bootstrap.dist.toml
Comment on lines -10 to -11
# Use libtest built from the source tree instead of the precompiled one from stage 0.
compiletest-use-stage0-libtest = false
Copy link
Contributor

Choose a reason for hiding this comment

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

This reminds me that I forgot to update the docs for compiletest-use-stage0-libtest in bootstrap.example.toml; feel free to do that in this PR if you want.

@Zalathar
Copy link
Contributor

Zalathar commented Oct 1, 2025

LGTM.

I'm not sure whether it's OK for me to approve this (with only a T-compiler hat), but if you think it's fine then r=me.

jieyouxu
jieyouxu approved these changes Oct 1, 2025
View reviewed changes
Copy link
Member

@jieyouxu jieyouxu left a comment •
edited by rustbot
Loading

Choose a reason for hiding this comment

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

You can r=Zalathar and me after updating the bootstrap.example.toml doc, thanks

View changes since this review

@jieyouxu
Copy link
Member

jieyouxu commented Oct 1, 2025

I'm not sure whether it's OK for me to approve this (with only a T-compiler hat), but if you think it's fine then r=me.

I think it's perfectly fine considering you've been heavily involved with removing this hack 😆

@jieyouxu jieyouxu self-assigned this Oct 1, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 1, 2025

This PR modifies bootstrap.example.toml.

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

@Kobzol
Copy link
Member Author

Kobzol commented Oct 1, 2025

I removed the config from the example config file, I think that's better than to say that it's just waiting for removal.

@jieyouxu
Copy link
Member

jieyouxu commented Oct 1, 2025

Wait actually can you double-check if rustc-dev-guide has any mention of this flag?

(Not at home currently.)

@Kobzol
Copy link
Member Author

Kobzol commented Oct 1, 2025

Haven't found any.

@jieyouxu
Copy link
Member

jieyouxu commented Oct 1, 2025

Thanks for checking
@bors r=Zalathar,jieyouxu rollup

@bors
Copy link
Collaborator

bors commented Oct 1, 2025

📌 Commit 3186902 has been approved by Zalathar,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 Oct 1, 2025
@Zalathar Zalathar mentioned this pull request Oct 1, 2025
Merged
bors added a commit that referenced this pull request Oct 1, 2025
@bors
Auto merge of #147220 - Zalathar:rollup-fubv0wy, r=Zalathar
d4ae855 
Rollup of 11 pull requests

Successful merges:

 - #146918 (add regression test)
 - #146980 (simplify setup_constraining_predicates, and note it is potentially cubic)
 - #147170 (compiletest: Pass around `DirectiveLine` instead of bare strings)
 - #147180 (add tests)
 - #147188 (Remove usage of `compiletest-use-stage0-libtest` from CI)
 - #147189 (Replace `rustc_span::Span` with a stripped down version for librustdoc's highlighter)
 - #147199 (remove outdated comment in (inner) `InferCtxt`)
 - #147200 (Fix autodiff empty ret regression)
 - #147209 (Remove `no-remap-src-base` from tests)
 - #147213 (Fix broken STD build for ESP-IDF)
 - #147217 (Don't create a top-level `true` directory when running UI tests)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ca8ed7e into rust-lang:master Oct 1, 2025
10 checks passed
@rustbot rustbot added this to the 1.92.0 milestone Oct 1, 2025
rust-timer added a commit that referenced this pull request Oct 1, 2025
@rust-timer
Unrolled build for #147188
9504ecb 
Rollup merge of #147188 - Kobzol:remove-compiletest-stage-1, r=Zalathar,jieyouxu

Remove usage of `compiletest-use-stage0-libtest` from CI

It shouldn't be needed anymore after #146929.

r? `@Zalathar`
@Kobzol Kobzol deleted the remove-compiletest-stage-1 branch October 1, 2025 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Zalathar Zalathar Zalathar left review comments

@jieyouxu jieyouxu jieyouxu approved these changes

Assignees

@Zalathar Zalathar

@jieyouxu jieyouxu

Labels
A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.92.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Kobzol @rustbot @Zalathar @jieyouxu @bors