Skip to content

Include aarch64-pc-windows-msvc in the dist manifests - #77902

Merged
bors merged 1 commit into
rust-lang:masterfrom
arlosi:arm64manifest
Oct 15, 2020
Merged

Include aarch64-pc-windows-msvc in the dist manifests#77902
bors merged 1 commit into
rust-lang:masterfrom
arlosi:arm64manifest

Conversation

@arlosi

@arlosiarlosi commented Oct 13, 2020

Copy link
Copy Markdown
Contributor

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 13, 2020
@ehuss

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Oct 13, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 401f7b9a29f451c59ccca4f337b7ede7c59576e4 has been approved by ehuss

@borsbors 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 Oct 13, 2020

@Alovchin91Alovchin91 left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Doesn't it need to be included in TARGETS as well?
nevermind, missed it 😅

@JohnTitorJohnTitor mentioned this pull request Oct 13, 2020
@Alovchin91

Copy link
Copy Markdown

@arlosi Looks like it conflicted with #77895 and failed to merge into a rollup. Sigh 😞 Is there a way to fix this, or it should wait for the next rollup (and thus won't get into tomorrow's nightly)?

@arlosi

Copy link
Copy Markdown
ContributorAuthor

I think we just need to wait for the rollup to complete and resolve the conflict.

@JohnTitorJohnTitor mentioned this pull request Oct 13, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 13, 2020
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

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

☔ 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:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

@borsbors 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 Oct 14, 2020
@arlosi

Copy link
Copy Markdown
ContributorAuthor

Resolve conflicts.

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author
r? @ehuss

@rustbotrustbot 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 Oct 14, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request 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

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit de4bcfd has been approved by ehuss

@borsbors 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 Oct 14, 2020
@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit de4bcfd with merge d5dd4442627a55d3d5135b6e554e22cacf46a1a6...

@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 14, 2020
@ehuss

Copy link
Copy Markdown
Contributor

@bors retry

error inflating zlib stream; class=Zlib (5)
rust-lang/cargo#8517

@borsbors 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 Oct 14, 2020
@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit de4bcfd with merge f0bfe8a3efec7fa740389732d02f986472aac2fa...

@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-actions

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 14, 2020
@emilyalbini

Copy link
Copy Markdown
Member

@bors retry

Spurious network failure.

@borsbors 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 Oct 14, 2020
@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

⌛ Testing commit de4bcfd with merge b517b2362ffabc768f54cd11e1715eb8ffddd4e1...

@bors

bors commented Oct 14, 2020

Copy link
Copy Markdown
Collaborator

💥 Test timed out

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 14, 2020
@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

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.
##[group]Run exit 1
exit 1
shell: /bin/bash --noprofile --norc -e -o pipefail {0}
##[endgroup]
##[error]Process completed with exit code 1.

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 @rust-lang/infra. (Feature Requests)

@ehuss

Copy link
Copy Markdown
Contributor

@bors retry
4+ hour mac build

@borsbors 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 Oct 14, 2020
@Alovchin91

Copy link
Copy Markdown

Is there a known issue with the pipeline, or is it just such an unlucky PR? 😐 Could a rebase help maybe?

@ehuss

Copy link
Copy Markdown
Contributor

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.
GitHub updated the macOS image which broke the CI, and that will be fixed via #77944.
The 4 hour thing is just random, and there's not much we can do about it. We think it is usually due to "noisy neighbors", or some other infrastructure problem out of our control.

@Alovchin91

Alovchin91 commented Oct 14, 2020

Copy link
Copy Markdown

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 😅

@JohnTitorJohnTitor mentioned this pull request Oct 14, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 14, 2020
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`
@bors
bors merged commit b3f9512 into rust-lang:masterOct 15, 2020
@rustbotrustbot added this to the 1.49.0 milestone Oct 15, 2020
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@arlosi@ehuss@bors@Alovchin91@emilyalbini@rust-log-analyzer@rust-highfive@rustbot