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.

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

Package non-rust objects #65337

Closed

Conversation

jethrogb
Copy link
Contributor

@jethrogb jethrogb commented Oct 12, 2019

Fixes #65335

I'd like to use this opportunity to talk about increasing test coverage of tier 2 targets to at least make sure a "hello world" binary can be succesfully linked. There have been similar issues for individual targets in the past, but now we have one affecting several tier 2 targets (and even a tier 1 target).

r? @Mark-Simulacrum
cc @cuviper

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 12, 2019
@jethrogb
Copy link
Contributor Author

Not sure how to properly test this.

@pietroalbini
Copy link
Member

The best way to test this I think is to open another PR with the same commits as this one but targeting a tmp-publish branch instead of master. Then we can r+ it, and once it's merged we can publish the build on dev-static so it's installable with rustup for all the platforms we distribute.

This is going to take time though, so I'd like (as proposed in #65335 (comment)) to rollback #64823 in the meantime.

@Mark-Simulacrum
Copy link
Member

The changes here look reasonable, even if it is presumably a bit unknown as to whether they actually fully fix things or not. I'm going to @bors r+ p=1 this PR with the goal of landing it nightly tonight. I believe we have enough time left that we can do the following:

  • land this PR, get a dev-static release with it, check if that fixes things -- if so, stop here
  • if things are not fixed by this PR, land a revert to it and the rustc-dev component PR, fixing tonight's nightly

This seems like a fast and reasonable approach to getting a working nightly tonight no matter what.

@bors
Copy link
Contributor

bors commented Oct 12, 2019

📌 Commit d3cae76a7ece0b65b882c3e16f3dbd682c666fc5 has been approved by Mark-Simulacrum

@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 Oct 12, 2019
@Mark-Simulacrum
Copy link
Member

@bors p=50

@bors
Copy link
Contributor

bors commented Oct 12, 2019

⌛ Testing commit d3cae76a7ece0b65b882c3e16f3dbd682c666fc5 with merge 64b6a78b008d714e9e1a4ee15e17361dfa896887...

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-musl of 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.
2019-10-12T15:18:56.5517007Z    Compiling test v0.0.0 (/checkout/src/libtest)
2019-10-12T15:19:10.6588421Z [RUSTC-TIMING] test test:false 14.103
2019-10-12T15:19:10.6606017Z     Finished release [optimized + debuginfo] target(s) in 1m 30s
2019-10-12T15:19:10.6743818Z Copying stage0 std from stage0 (x86_64-unknown-linux-musl -> x86_64-unknown-linux-musl / x86_64-unknown-linux-musl)
2019-10-12T15:19:10.6756233Z thread 'main' panicked at 'src.symlink_metadata() failed with No such file or directory (os error 2)', src/bootstrap/lib.rs:1148:24
2019-10-12T15:19:10.7001045Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap dist --build x86_64-unknown-linux-musl
2019-10-12T15:19:10.7001804Z Build completed unsuccessfully in 0:01:32
2019-10-12T15:19:10.7055085Z == clock drift check ==
2019-10-12T15:19:10.7073596Z   local time: Sat Oct 12 15:19:10 UTC 2019
2019-10-12T15:19:10.7073596Z   local time: Sat Oct 12 15:19:10 UTC 2019
2019-10-12T15:19:10.8723848Z   network time: Sat, 12 Oct 2019 15:19:10 GMT
2019-10-12T15:19:10.8724299Z == end clock drift check ==
2019-10-12T15:19:11.6303780Z ##[error]Bash exited with code '1'.
2019-10-12T15:19:11.6355761Z ##[section]Starting: Upload CPU usage statistics
2019-10-12T15:19:11.6373706Z ==============================================================================
2019-10-12T15:19:11.6373824Z Task         : Bash
2019-10-12T15:19:11.6373902Z Description  : Run a Bash script on macOS, Linux, or Windows

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 @TimNN. (Feature Requests)

@bors
Copy link
Contributor

bors commented Oct 12, 2019

💔 Test failed - checks-azure

@bors bors 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 12, 2019
@jethrogb
Copy link
Contributor Author

I've seen this error in my internal CI when the source file inside copy_third_party_objects doesn't exist.

@@ -1144,6 +1144,7 @@ impl Build {
pub fn copy(&self, src: &Path, dst: &Path) {
if self.config.dry_run { return; }
self.verbose_than(1, &format!("Copy {:?} to {:?}", src, dst));
if src == dst { return; }
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Not sure why this is now necessary, but hey, it appears to work!

@pietroalbini
Copy link
Member

@bors try

@bors
Copy link
Contributor

bors commented Oct 12, 2019

⌛ Trying commit 8d4210a with merge 64d69a848361a21d478014cce5b51a11e10aec51...

@bors
Copy link
Contributor

bors commented Oct 12, 2019

☀️ Try build successful - checks-azure
Build commit: 64d69a848361a21d478014cce5b51a11e10aec51 (64d69a848361a21d478014cce5b51a11e10aec51)

@gnzlbg
Copy link
Contributor

gnzlbg commented Oct 14, 2019

I'd like to use this opportunity to talk about increasing test coverage of tier 2 targets to at least make sure a "hello world" binary can be successfully linked. There have been similar issues for individual targets in the past, but now we have one affecting several tier 2 targets (and even a tier 1 target).

+1. Ideally we would run these tests with the post build artifacts in a clean environment to be able to diagnose PRs that change how things are packaged.

Any chance of merging this soon ?

@jethrogb
Copy link
Contributor Author

@gnzlbg the PR that broke everything was reverted in #65342, tonight's nightly should work again. I don't think people are in a hurry to re-land it.

@gnzlbg
Copy link
Contributor

gnzlbg commented Oct 14, 2019

Ah sorry, I missed that. Thanks for the info.

bors added a commit that referenced this pull request Oct 16, 2019
[dev-nightly] Testing out rustc-dev

This PR targets a non-official branch such that we can run full CI and eventually build a nightly from the branch on dev-static; this will hopefully allow us to iron out kinks prior to merging this PR's commits into master proper.

cc #64823 and #65337
@Mark-Simulacrum
Copy link
Member

Closing in favor of #65474 which includes this.

bors added a commit that referenced this pull request Oct 23, 2019
Split the rustc target libraries into separate rustc-dev component

This is re-applies a squashed version of #64823 as well as including #65337 to fix bugs noted after merging the first PR.

The second PR is confirmed as fixing windows-gnu, and presumably also fixes other platforms, such as musl (i.e. #65335 should be fixed); `RUSTUP_DIST_SERVER=https://dev-static.rust-lang.org rustup toolchain install nightly-2019-10-16` can be installed to confirm that this is indeed the case.
bors added a commit that referenced this pull request Oct 24, 2019
Split the rustc target libraries into separate rustc-dev component

This is re-applies a squashed version of #64823 as well as including #65337 to fix bugs noted after merging the first PR.

The second PR is confirmed as fixing windows-gnu, and presumably also fixes other platforms, such as musl (i.e. #65335 should be fixed); `RUSTUP_DIST_SERVER=https://dev-static.rust-lang.org rustup toolchain install nightly-2019-10-16` can be installed to confirm that this is indeed the case.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3rd party objects missing from nightly-2019-10-12
6 participants