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

Migrate run-make/symlinked-rlib to rmake.rs #126015

Closed
wants to merge 1 commit into from
Closed

Migrate run-make/symlinked-rlib to rmake.rs #126015

wants to merge 1 commit into from

Conversation

GuillaumeGomez
Copy link
Member

Part of #121876.

r? @jieyouxu

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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 Jun 5, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 5, 2024

Some changes occurred in run-make tests.

cc @jieyouxu

@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu approved these changes Jun 6, 2024
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, r=me after fixing the tidy failure.

@jieyouxu
Copy link
Member

jieyouxu commented Jun 6, 2024

@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 Jun 6, 2024
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-symlinked-rlib branch from 58c1dfe to 5772181 Compare June 6, 2024 07:54
@GuillaumeGomez
Copy link
Member Author

@bors r=jieyouxu rollup

@bors
Copy link
Contributor

bors commented Jun 6, 2024

📌 Commit 5772181 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 6, 2024
fmease added a commit to fmease/rust that referenced this pull request Jun 6, 2024
@fmease
Rollup merge of rust-lang#126015 - GuillaumeGomez:migrate-run-make-sy…
7d2e75a 
…mlinked-rlib, r=jieyouxu

Migrate `run-make/symlinked-rlib` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
@fmease fmease mentioned this pull request Jun 6, 2024
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 6, 2024
@GuillaumeGomez
Rollup merge of rust-lang#126015 - GuillaumeGomez:migrate-run-make-sy…
8ff5334 
…mlinked-rlib, r=jieyouxu

Migrate `run-make/symlinked-rlib` to `rmake.rs`

Part of rust-lang#121876.

r? ``@jieyouxu``
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 6, 2024
Closed
@jieyouxu
Copy link
Member

jieyouxu commented Jun 6, 2024

@bors r-
@rustbot blocked (waiting on #125736)

@rustbot rustbot added the S-blocked Status: Blocked on something else such as an RFC or other implementation work. label Jun 6, 2024
@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-blocked Status: Blocked on something else such as an RFC or other implementation work. labels Jun 6, 2024
@fmease fmease added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 6, 2024
@jieyouxu
Copy link
Member

jieyouxu commented Jun 9, 2024 •
edited
Loading

Sorry I completely missed this (I think I missed updating the tracking issue), but I think this collides with #125674 because both PRs are modifying the same test. I was updating the tracking issue and noticed just now. I'll take a closer look later to see which port we should go for...

I apologize for not keeping the tracking issue more up to date and failing to notice that there was already an PR modifying this test.

@Kobzol Kobzol added the A-run-make Area: port run-make Makefiles to rmake.rs label Jun 9, 2024
@bors
Copy link
Contributor

bors commented Jun 13, 2024

☔ The latest upstream changes (presumably #126374) made this pull request unmergeable. Please resolve the merge conflicts.

@GuillaumeGomez
Copy link
Member Author

Closing then!

@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-symlinked-rlib branch June 13, 2024 09:25
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
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-blocked Status: Blocked on something else such as an RFC or other implementation work. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@GuillaumeGomez @rustbot @rust-log-analyzer @jieyouxu @bors @Kobzol @fmease