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 crate-hash-rustc-version to rmake #127693

Merged
merged 2 commits into from
Jul 20, 2024
Merged

Migrate crate-hash-rustc-version to rmake #127693

merged 2 commits into from
Jul 20, 2024

Conversation

Rejyr
Copy link
Contributor

@Rejyr Rejyr commented Jul 13, 2024 •
edited by jieyouxu
Loading

Part of #121876.

r? @jieyouxu

try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux

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

rustbot commented Jul 13, 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

@Kobzol Kobzol mentioned this pull request Jul 14, 2024
Open
jieyouxu
jieyouxu approved these changes Jul 14, 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, looks good in general, just some minor nits. I'll run your PR through a few try-jobs to check.

tests/run-make/crate-hash-rustc-version/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/crate-hash-rustc-version/rmake.rs Outdated
// a.rs is a dylib
rustc().input("a.rs").crate_type("dylib").args(&flags).run();

// Write symbols to disk.
Copy link
Member

Choose a reason for hiding this comment

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

Question: is this accurate, or did we just write to stdout?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Writing to disk was a part of the Makefile implementation. I'll update the comment to align with the rmake implementation.

tests/run-make/crate-hash-rustc-version/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/crate-hash-rustc-version/rmake.rs Outdated Show resolved Hide resolved
tests/run-make/crate-hash-rustc-version/rmake.rs Outdated Show resolved Hide resolved
@jieyouxu
Copy link
Member

@bors try

@jieyouxu
Copy link
Member

@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 Jul 14, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 14, 2024
@bors
Auto merge of rust-lang#127693 - Rejyr:migrate-crate-hash-rustc-versi…
3804d28 
…on-rmake, r=<try>

Migrate `crate-hash-rustc-version` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

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

bors commented Jul 14, 2024

⌛ Trying commit 3f904e0 with merge 3804d28...

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 14, 2024

💔 Test failed - checks-actions

@Rejyr Rejyr force-pushed the migrate-crate-hash-rustc-version-rmake branch from 3f904e0 to 33f651b Compare July 14, 2024 15:05
@Rejyr
Copy link
Contributor Author

Rejyr commented Jul 14, 2024

@rustbot review

@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 14, 2024
@Rejyr Rejyr force-pushed the migrate-crate-hash-rustc-version-rmake branch from d409235 to 50f3293 Compare July 15, 2024 23:53
@jieyouxu
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Jul 16, 2024

⌛ Trying commit 50f3293 with merge 959b44f...

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127693 - Rejyr:migrate-crate-hash-rustc-versi…
959b44f 
…on-rmake, r=<try>

Migrate `crate-hash-rustc-version` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: dist-x86_64-linux
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 16, 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 Jul 16, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2024
@bors
Auto merge of rust-lang#127693 - Rejyr:migrate-crate-hash-rustc-versi…
d8360e1 
…on-rmake, r=<try>

Migrate `crate-hash-rustc-version` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-msvc
try-job: aarch64-apple
try-job: dist-x86_64-linux
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Jul 16, 2024

💔 Test failed - checks-actions

@Rejyr Rejyr force-pushed the migrate-crate-hash-rustc-version-rmake branch from 50f3293 to 4c6f4d6 Compare July 16, 2024 15:28
@Rejyr Rejyr force-pushed the migrate-crate-hash-rustc-version-rmake branch from 4c6f4d6 to eea6502 Compare July 17, 2024 10:49
@Rejyr
Copy link
Contributor Author

Rejyr commented Jul 18, 2024

@rustbot review

Also needs bors try.

@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 try

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 18, 2024
@bors
Auto merge of rust-lang#127693 - Rejyr:migrate-crate-hash-rustc-versi…
f71476d 
…on-rmake, r=<try>

Migrate `crate-hash-rustc-version` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
@bors
Copy link
Contributor

bors commented Jul 18, 2024

⌛ Trying commit eea6502 with merge f71476d...

@bors
Copy link
Contributor

bors commented Jul 18, 2024

☀️ Try build successful - checks-actions
Build commit: f71476d (f71476d6dfb7dd7df0a265a59ce737ac54cdb97d)

jieyouxu
jieyouxu approved these changes Jul 19, 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.

Thank you!

@jieyouxu
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jul 19, 2024

📌 Commit eea6502 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 19, 2024
tgross35 added a commit to tgross35/rust that referenced this pull request Jul 19, 2024
@tgross35
Rollup merge of rust-lang#127693 - Rejyr:migrate-crate-hash-rustc-ver…
52fe840 
…sion-rmake, r=jieyouxu

Migrate `crate-hash-rustc-version` to `rmake`

Part of rust-lang#121876.

r? `@jieyouxu`

try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
@tgross35 tgross35 mentioned this pull request Jul 19, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2024
@bors
Auto merge of rust-lang#127991 - tgross35:rollup-ccfammj, r=tgross35
ead9d17 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#123196 (Add Process support for UEFI)
 - rust-lang#127523 (Migrate `dump-ice-to-disk` and `panic-abort-eh_frame` `run-make` tests to rmake)
 - rust-lang#127556 (Replace a long inline "autoref" comment with method docs)
 - rust-lang#127693 (Migrate `crate-hash-rustc-version` to `rmake`)
 - rust-lang#127866 (Conditionally build `wasm-component-ld` )
 - rust-lang#127918 (Safely enforce thread name requirements)
 - rust-lang#127948 (fixes panic error `index out of bounds` in conflicting error)
 - rust-lang#127980 (Avoid ref when using format! in compiler)

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

Rollup of 9 pull requests

Successful merges:

 - rust-lang#123196 (Add Process support for UEFI)
 - rust-lang#127556 (Replace a long inline "autoref" comment with method docs)
 - rust-lang#127693 (Migrate `crate-hash-rustc-version` to `rmake`)
 - rust-lang#127866 (Conditionally build `wasm-component-ld` )
 - rust-lang#127918 (Safely enforce thread name requirements)
 - rust-lang#127948 (fixes panic error `index out of bounds` in conflicting error)
 - rust-lang#127980 (Avoid ref when using format! in compiler)
 - rust-lang#127984 (Avoid ref when using format! in src)
 - rust-lang#127987 (More accurate suggestion for `-> Box<dyn Trait>` or `-> impl Trait`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2024
@bors
Auto merge of rust-lang#127998 - matthiaskrgr:rollup-ykp0h5r, r=matth…
1afc5fd 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#123196 (Add Process support for UEFI)
 - rust-lang#127556 (Replace a long inline "autoref" comment with method docs)
 - rust-lang#127693 (Migrate `crate-hash-rustc-version` to `rmake`)
 - rust-lang#127866 (Conditionally build `wasm-component-ld` )
 - rust-lang#127918 (Safely enforce thread name requirements)
 - rust-lang#127948 (fixes panic error `index out of bounds` in conflicting error)
 - rust-lang#127980 (Avoid ref when using format! in compiler)
 - rust-lang#127984 (Avoid ref when using format! in src)
 - rust-lang#127987 (More accurate suggestion for `-> Box<dyn Trait>` or `-> impl Trait`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit aa6ae4b into rust-lang:master Jul 20, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jul 20, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 20, 2024
@rust-timer
Unrolled build for rust-lang#127693
94d4fdf 
Rollup merge of rust-lang#127693 - Rejyr:migrate-crate-hash-rustc-version-rmake, r=jieyouxu

Migrate `crate-hash-rustc-version` to `rmake`

Part of rust-lang#121876.

r? ``@jieyouxu``

try-job: x86_64-gnu-llvm-18
try-job: dist-x86_64-linux
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Oneirical Oneirical Oneirical left review comments

@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.
6 participants
@Rejyr @rustbot @jieyouxu @bors @rust-log-analyzer @Oneirical