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.
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
Migrate run-make/c-link-to-rust-staticlib
to rmake
#125027
Conversation
Some changes occurred in run-make tests. cc @jieyouxu |
// See https://github.com/rust-lang/rust/issues/10434 | ||
|
||
//@ ignore-cross-compile | ||
//@ ignore-freebsd |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a good reason for ignore-freebsd
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I found this commit which added the FreeBSD ignore. Seems linked to #12460, which was a looooong time ago and had a different-looking Makefile back then. Let's see if we can remove it.
You can see how cursed this really is, because in another issue, they fix a test on FreeBSD... by adding one second to the sleep command.
Unless there's a good reason for @rustbot author |
Yes please give this PR a try on a FreeBSD CI job if possible |
@bors rollup=iffy |
You'll want to follow this https://rustc-dev-guide.rust-lang.org/tests/ci.html?highlight=CI#testing-with-ci not the infra page |
This comment has been minimized.
This comment has been minimized.
abfcd0d
to
94319fe
Compare
Looks like the FreeBSD ignore was there for a reason. Ignore statement restored. Though, looking at the logs, the build passed, it's just the upload of artifacts which failed? Does this have anything to do with the test? |
This comment has been minimized.
This comment has been minimized.
☔ The latest upstream changes (presumably #125026) made this pull request unmergeable. Please resolve the merge conflicts. |
CI looks unrelated, can you remove the |
There are merge commits (commits with multiple parents) in your changes. We have a no merge policy so these commits will need to be removed for this pull request to be merged. You can start a rebase with the following commands:
The following commits are merge commits: |
You'll probably have to rebase :3 |
Yep, I accidentally clicked the wrong button on the Github website while looking at the merge conflict. |
GitHub's merge UI is almost always a trap. I just do merge conflict resolution offline. |
e60d8dc
to
fc819fa
Compare
Let us give arbitrary try jobs a try (heh) @bors try |
Migrate `run-make/c-link-to-rust-staticlib` to `rmake` Part of rust-lang#121876. r? `@jieyouxu` try-job: dist-x86_64-freebsd
☀️ Try build successful - checks-actions |
@bors r+ |
…eyouxu Migrate `run-make/c-link-to-rust-staticlib` to `rmake` Part of rust-lang#121876. r? `@jieyouxu` try-job: dist-x86_64-freebsd
Rollup of 5 pull requests Successful merges: - rust-lang#124746 (`rustc --explain E0582` additional example) - rust-lang#124975 (Use an helper to move the files) - rust-lang#125027 (Migrate `run-make/c-link-to-rust-staticlib` to `rmake`) - rust-lang#125084 (`rustc_hir_typeck`: Account for `skipped_ref_pats` in `expr_use_visitor`) - rust-lang#125104 (Migrate `run-make/no-cdylib-as-rdylib` to `rmake`) r? `@ghost` `@rustbot` modify labels: rollup
…ouxu Migrate `run-make/c-link-to-rust-staticlib` to `rmake` Part of rust-lang#121876. r? `@jieyouxu` try-job: dist-x86_64-freebsd
💔 Test failed - checks-actions |
This comment has been minimized.
This comment has been minimized.
@bors r+ rollup |
Rollup of 6 pull requests Successful merges: - rust-lang#124307 (Optimize character escaping.) - rust-lang#124975 (Use an helper to move the files) - rust-lang#125027 (Migrate `run-make/c-link-to-rust-staticlib` to `rmake`) - rust-lang#125038 (Invert comparison in `uN::checked_sub`) - rust-lang#125104 (Migrate `run-make/no-cdylib-as-rdylib` to `rmake`) - rust-lang#125137 (MIR operators: clarify Shl/Shr handling of negative offsets) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#125027 - Oneirical:c-test-with-remove, r=jieyouxu Migrate `run-make/c-link-to-rust-staticlib` to `rmake` Part of rust-lang#121876. r? `@jieyouxu`
Part of #121876.
r? @jieyouxu