Uh oh!
There was an error while loading. Please reload this page.
Include aarch64-pc-windows-msvc in the dist manifests - #77902
Conversation
ehuss
commented
Oct 13, 2020
@bors r+ rollup |
bors
commented
Oct 13, 2020
📌 Commit 401f7b9a29f451c59ccca4f337b7ede7c59576e4 has been approved by |
Alovchin91
commented
Oct 13, 2020
arlosi
commented
Oct 13, 2020
I think we just need to wait for the rollup to complete and resolve the conflict. |
Rollup of 14 pull requests Successful merges: - rust-lang#77239 (Enable building Cargo for aarch64-apple-darwin) - rust-lang#77569 (BTreeMap: type-specific variants of node_as_mut and cast_unchecked) - rust-lang#77719 (Remove unnecessary rustc_const_stable attributes.) - rust-lang#77722 (Remove unsafety from sys/unsupported and add deny(unsafe_op_in_unsafe_fn).) - rust-lang#77725 (Add regression issue template) - rust-lang#77776 ( Give an error when running `x.py test --stage 0 src/test/ui`) - rust-lang#77786 (Mention rustdoc in `x.py setup`) - rust-lang#77825 (`min_const_generics` diagnostics improvements) - rust-lang#77868 (Include `llvm-dis`, `llc` and `opt` in `llvm-tools-preview` component) - rust-lang#77884 (Use Option::unwrap_or instead of open-coding it) - rust-lang#77886 (Replace trivial bool matches with the `matches!` macro) - rust-lang#77892 (Replace absolute paths with relative ones) - rust-lang#77895 (Include aarch64-apple-darwin in the dist manifests) - rust-lang#77909 (bootstrap: set correct path for the build-manifest binary) Failed merges: - rust-lang#77902 (Include aarch64-pc-windows-msvc in the dist manifests) r? `@ghost`
bors
commented
Oct 14, 2020
☔ The latest upstream changes (presumably #77917) made this pull request unmergeable. Please resolve the merge conflicts. Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels: |
arlosi
commented
Oct 14, 2020
Rollup of 8 pull requests Successful merges: - rust-lang#77765 (Add LLVM flags to limit DWARF version to 2 on BSD) - rust-lang#77788 (BTreeMap: fix gdb provider on BTreeMap with ZST keys or values) - rust-lang#77795 (Codegen backend interface refactor) - rust-lang#77808 (Moved the main `impl` for FnCtxt to its own file.) - rust-lang#77817 (Switch rustdoc from `clean::Stability` to `rustc_attr::Stability`) - rust-lang#77829 (bootstrap: only use compiler-builtins-c if they exist) - rust-lang#77870 (Use intra-doc links for links to module-level docs) - rust-lang#77897 (Move `Strip` into a separate rustdoc pass) Failed merges: - rust-lang#77879 (Provide better documentation and help messages for x.py setup) - rust-lang#77902 (Include aarch64-pc-windows-msvc in the dist manifests) r? `@ghost`
ehuss
commented
Oct 14, 2020
@bors r+ |
bors
commented
Oct 14, 2020
📌 Commit de4bcfd has been approved by |
bors
commented
Oct 14, 2020
⌛ Testing commit de4bcfd with merge d5dd4442627a55d3d5135b6e554e22cacf46a1a6... |
bors
commented
Oct 14, 2020
💔 Test failed - checks-actions |
ehuss
commented
Oct 14, 2020
@bors retry
|
bors
commented
Oct 14, 2020
⌛ Testing commit de4bcfd with merge f0bfe8a3efec7fa740389732d02f986472aac2fa... |
bors
commented
Oct 14, 2020
💔 Test failed - checks-actions |
emilyalbini
commented
Oct 14, 2020
@bors retry Spurious network failure. |
bors
commented
Oct 14, 2020
⌛ Testing commit de4bcfd with merge b517b2362ffabc768f54cd11e1715eb8ffddd4e1... |
bors
commented
Oct 14, 2020
💥 Test timed out |
rust-log-analyzer
commented
Oct 14, 2020
Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
ehuss
commented
Oct 14, 2020
@bors retry |
Alovchin91
commented
Oct 14, 2020
Is there a known issue with the pipeline, or is it just such an unlucky PR? 😐 Could a rebase help maybe? |
ehuss
commented
Oct 14, 2020
Nah, just a string of bad luck. It should get merged soon. I'm working on fixing rust-lang/cargo#8517, but that will take at least a few days. |
Thanks for the detailed explanation! So I guess after #77944 has been merged the only thing we can do is keep trying? Oh well, those flaky CIs 😅 |
Rollup of 9 pull requests Successful merges: - rust-lang#77570 (Allow ascii whitespace char for doc aliases ) - rust-lang#77739 (Remove unused code) - rust-lang#77753 (Check html comments) - rust-lang#77879 (Provide better documentation and help messages for x.py setup) - rust-lang#77902 (Include aarch64-pc-windows-msvc in the dist manifests) - rust-lang#77934 (Document -Z codegen-backend in the unstable book) - rust-lang#77936 (Remove needless alloc_slice) - rust-lang#77946 (Validate references to source scopes) - rust-lang#77951 (Update books) Failed merges: r? `@ghost`
r? @ehuss
/cc @pietroalbini@Mark-Simulacrum
#72881