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/link-framework to rmake.rs #126898

Merged
merged 1 commit into from
Jul 23, 2024
Merged

Migrate run-make/link-framework to rmake.rs #126898

merged 1 commit into from
Jul 23, 2024

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jun 24, 2024 •
edited by Kobzol
Loading

Part of #121876.

r? @Kobzol

try-job: x86_64-apple-1

@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 Jun 24, 2024
@rustbot
Copy link
Collaborator

rustbot commented Jun 24, 2024

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

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Kobzol Kobzol mentioned this pull request Jun 24, 2024
Open
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-link-framework branch from 2cb3bda to dd7d6b0 Compare June 24, 2024 10:47
@GuillaumeGomez
Copy link
Member Author

Fixed fmt. :)

Kobzol
Kobzol reviewed Jun 25, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Looks good, let's try if it works on Apple.

@bors try

tests/run-make/link-framework/rmake.rs Outdated Show resolved Hide resolved
@Kobzol
Copy link
Contributor

Kobzol commented Jun 25, 2024

@bors try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 25, 2024
@bors
Auto merge of rust-lang#126898 - GuillaumeGomez:migrate-run-make-link…
dd07e74 
…-framework, r=<try>

Migrate `run-make/link-framework` to `rmake.rs`

Part of rust-lang#121876.

r? `@Kobzol`

try-job: x86_64-apple-1
@bors
Copy link
Contributor

bors commented Jun 25, 2024

⌛ Trying commit dd7d6b0 with merge dd07e74...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jun 25, 2024

💔 Test failed - checks-actions

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 25, 2024
@bors
Copy link
Contributor

bors commented Jul 19, 2024

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

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-link-framework branch from dd7d6b0 to 4b8f12b Compare July 22, 2024 14:53
@GuillaumeGomez
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jul 22, 2024

⌛ Trying commit 4b8f12b with merge e421ffb...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@bors
Auto merge of rust-lang#126898 - GuillaumeGomez:migrate-run-make-link…
e421ffb 
…-framework, r=<try>

Migrate `run-make/link-framework` to `rmake.rs`

Part of rust-lang#121876.

r? `@Kobzol`

try-job: x86_64-apple-1
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 22, 2024

💔 Test failed - checks-actions

@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-link-framework branch from 4b8f12b to d0d137b Compare July 22, 2024 19:13
@GuillaumeGomez
Copy link
Member Author

@bors try

@bors
Copy link
Contributor

bors commented Jul 22, 2024

⌛ Trying commit d0d137b with merge 59026b7...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 22, 2024
@bors
Auto merge of rust-lang#126898 - GuillaumeGomez:migrate-run-make-link…
59026b7 
…-framework, r=<try>

Migrate `run-make/link-framework` to `rmake.rs`

Part of rust-lang#121876.

r? `@Kobzol`

try-job: x86_64-apple-1
@bors
Copy link
Contributor

bors commented Jul 22, 2024

☀️ Try build successful - checks-actions
Build commit: 59026b7 (59026b71af5444e0be0413bada5f3b6abdc5b30d)

Kobzol
Kobzol reviewed Jul 22, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Left one nit, otherwise LGTM. You can r=me after removing the unnecessary variables.

tests/run-make/link-framework/rmake.rs Outdated Show resolved Hide resolved
@GuillaumeGomez GuillaumeGomez force-pushed the migrate-run-make-link-framework branch from d0d137b to e8e6111 Compare July 22, 2024 21:22
@Kobzol
Copy link
Contributor

Kobzol commented Jul 23, 2024

@bors r+

@bors
Copy link
Contributor

bors commented Jul 23, 2024

📌 Commit e8e6111 has been approved by Kobzol

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 Jul 23, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 23, 2024
@tgross35
Rollup merge of rust-lang#126898 - GuillaumeGomez:migrate-run-make-li…
d748101 
…nk-framework, r=Kobzol

Migrate `run-make/link-framework` to `rmake.rs`

Part of rust-lang#121876.

r? `@Kobzol`

try-job: x86_64-apple-1
@tgross35 tgross35 mentioned this pull request Jul 23, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@bors
Auto merge of rust-lang#128088 - tgross35:rollup-5jeeoew, r=tgross35
a3d7cff 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#124895 (Disallow hidden references to mutable static)
 - rust-lang#125834 (treat `&raw (const|mut) UNSAFE_STATIC` implied deref as safe)
 - rust-lang#126898 (Migrate `run-make/link-framework` to `rmake.rs`)
 - rust-lang#127962 (Cleanup compiletest dylib name calculation)
 - rust-lang#127990 (Migrate `lto-linkage-used-attr`, `no-duplicate-libs` and `pgo-gen-no-imp-symbols` `run-make` tests to rmake)
 - rust-lang#128067 (Get rid of `can_eq_shallow`)
 - rust-lang#128076 (Get rid of `InferCtxtExt` from `error_reporting::traits`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Jul 23, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@bors
Auto merge of rust-lang#128109 - matthiaskrgr:rollup-gc7kopi, r=matth…
8bfcae7 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125886 (Migrate run make issue 15460)
 - rust-lang#126898 (Migrate `run-make/link-framework` to `rmake.rs`)
 - rust-lang#126994 (Support lists and stylings in more places for `rustc --explain`)
 - rust-lang#127990 (Migrate `lto-linkage-used-attr`, `no-duplicate-libs` and `pgo-gen-no-imp-symbols` `run-make` tests to rmake)
 - rust-lang#128060 (Fix inclusion of `wasm-component-ld` in dist artifacts)
 - rust-lang#128082 (Note closure captures when reporting cast to fn ptr failed)
 - rust-lang#128098 (make it possible to disable download-rustc if it's incompatible)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f1a29ee into rust-lang:master Jul 23, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Jul 23, 2024
@GuillaumeGomez GuillaumeGomez deleted the migrate-run-make-link-framework branch July 23, 2024 22:07
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 23, 2024
@rust-timer
Unrolled build for rust-lang#126898
841af72 
Rollup merge of rust-lang#126898 - GuillaumeGomez:migrate-run-make-link-framework, r=Kobzol

Migrate `run-make/link-framework` to `rmake.rs`

Part of rust-lang#121876.

r? ``@Kobzol``

try-job: x86_64-apple-1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

@jieyouxu jieyouxu jieyouxu left review comments

Assignees

@Kobzol Kobzol

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.82.0
Development

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