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 macos-fat-archive, manual-link and archive-duplicate-names run-make tests to rmake #127825

Merged
merged 3 commits into from
Jul 19, 2024
Merged

Migrate macos-fat-archive, manual-link and archive-duplicate-names run-make tests to rmake #127825

merged 3 commits into from
Jul 19, 2024

Conversation

Oneirical
Copy link
Contributor

Part of #121876 and the associated Google Summer of Code project.

Please try:

try-job: x86_64-msvc
try-job: aarch64-apple

@rustbot
Copy link
Collaborator

rustbot commented Jul 16, 2024

r? @jieyouxu

rustbot has assigned @jieyouxu.
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 A-run-make Area: port run-make Makefiles to rmake.rs 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 Jul 16, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jul 16, 2024

The run-make-support library was changed

cc @jieyouxu

This PR modifies tests/run-make/. If this PR is trying to port a Makefile
run-make test to use rmake.rs, please update the
run-make port tracking issue
so we can track our progress. You can either modify the tracking issue
directly, or you can comment on the tracking issue and link this PR.

cc @jieyouxu

@tgross35
Copy link
Contributor

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127825 - Oneirical:self-testeem, r=<try>
89137b1 
Migrate `macos-fat-archive`, `manual-link` and `archive-duplicate-names` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: aarch64-apple
@bors
Copy link
Contributor

bors commented Jul 16, 2024

⌛ Trying commit 3a14ef0 with merge 89137b1...

@bors
Copy link
Contributor

bors commented Jul 16, 2024

☀️ Try build successful - checks-actions
Build commit: 89137b1 (89137b1a6bf921962101fc4e5ca80885d76f0821)

@Kobzol Kobzol mentioned this pull request Jul 17, 2024
Open
@jieyouxu
Copy link
Member

jieyouxu commented Jul 17, 2024 •
edited

Question: is build_native_static_lib conflicting with any other PR (I think it does?), and if so, should this be blocked on some PR that first introduces the helper?

@Oneirical
Copy link
Contributor Author

Question: is build_native_static_lib conflicting with any other PR (I think it does?), and if so, should this be blocked on some PR that first introduces the helper?

Not anymore since #126208 got merged. I still shuffle lib.rs around a bit so that the shallow_find_files companion functions are all nicely packed together.

@jieyouxu
Copy link
Member

Not anymore since #126208 got merged. I still shuffle lib.rs around a bit so that the shallow_find_files companion functions are all nicely packed together.

Er, do you mind waiting for #127760 which will... shuffle lib.rs quite a bit?

@jieyouxu
Copy link
Member

@rustbot blocked (on #127760)

@rustbot rustbot added S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 17, 2024
@jieyouxu
Copy link
Member

@rustbot review (unblocked, ill take a look soon)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-blocked Status: Marked as blocked ❌ on something else such as an RFC or other implementation work. labels Jul 17, 2024
@bors
Copy link
Contributor

bors commented Jul 17, 2024

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
jieyouxu
jieyouxu approved these changes Jul 18, 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, changes look reasonable to me.

@jieyouxu
Copy link
Member

@bors r+ rollup=iffy (building c, llvm-ar usage)

@bors
Copy link
Contributor

bors commented Jul 18, 2024

📌 Commit 53f61e1 has been approved by jieyouxu

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 18, 2024
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 18, 2024
@bors
Copy link
Contributor

bors commented Jul 18, 2024

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

@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. labels Jul 18, 2024
@Oneirical
Copy link
Contributor Author

@rustbot ready
Please re-approve.

@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 Jul 18, 2024
@jieyouxu
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 18, 2024

📌 Commit 47c2101 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 Jul 18, 2024
@tgross35 tgross35 mentioned this pull request Jul 19, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
@bors
Auto merge of rust-lang#127956 - tgross35:rollup-8ten7pk, r=tgross35
11e5724 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#121533 (Handle .init_array link_section specially on wasm)
 - rust-lang#127825 (Migrate `macos-fat-archive`, `manual-link` and `archive-duplicate-names` `run-make` tests to rmake)
 - rust-lang#127891 (Tweak suggestions when using incorrect type of enum literal)
 - rust-lang#127902 (`collect_tokens_trailing_token` cleanups)
 - rust-lang#127928 (Migrate `lto-smoke-c` and `link-path-order` `run-make` tests to rmake)
 - rust-lang#127935 (Change `binary_asm_labels` to only fire on x86 and x86_64)
 - rust-lang#127953 ([compiletest] Search *.a when getting dynamic libraries on AIX)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 39ccb8a into rust-lang:master Jul 19, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 19, 2024
@rust-timer
Unrolled build for rust-lang#127825
a239c56 
Rollup merge of rust-lang#127825 - Oneirical:self-testeem, r=jieyouxu

Migrate `macos-fat-archive`, `manual-link` and `archive-duplicate-names` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: aarch64-apple
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-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
Oxidizing run-make tests
Status: Done
Milestone
1.81.0
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@Oneirical @rustbot @tgross35 @bors @jieyouxu @rust-log-analyzer