Skip to content

Another round of nightly fixes #38353

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

Merged
merged 3 commits into from
Dec 13, 2016
Merged

Conversation

alexcrichton
Copy link
Member

Another three separate errors happened last night:

  • Race condition in save analysis failed the OX build
  • Packaging docs that don't exist failed the Android build
  • Packaging save-analysis that doesn't exist failed the cross host builds

It just never ends...

The OSX bots failed last night due a race condition in save analysis where
concurrent calls to `fs::create_dir_all` conflicted with one another. This
replaces the relevant function call with `fs::create_dir_racy` which is defined
internally to the compiler.
This commit skips a few more dist tragets during compilation which shouldn't be
necessary.

* First, when packaging std we only take action when the host target is the
  build target. Otherwise we package the same artifacts a number of times, which
  shouldn't be necessary.
* Next, we apply the same logic to the save-analysis build. This is actually
  required for correctness as the build compiler is the only one which actually
  has save analysis information. This should fix an error seen on nightlies.
This commit skips the `docs` dist step if the `--disable-docs` flag is passed,
fixing a compile error seen on nightly.
@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member Author

@bors: r+ p=1

@bors
Copy link
Collaborator

bors commented Dec 13, 2016

📌 Commit 194c3fb has been approved by alexcrichton

@est31 est31 mentioned this pull request Dec 13, 2016
@bors
Copy link
Collaborator

bors commented Dec 13, 2016

⌛ Testing commit 194c3fb with merge 2ac7121...

bors added a commit that referenced this pull request Dec 13, 2016
Another round of nightly fixes

Another three separate errors happened last night:

* Race condition in save analysis failed the OX build
* Packaging docs that don't exist failed the Android build
* Packaging save-analysis that doesn't exist failed the cross host builds

It just never ends...
@bors bors merged commit 194c3fb into rust-lang:master Dec 13, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants