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.

Sign up for GitHub

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

Jump to bottom

[beta] Attempt to fix the component manifest problem for rls-preview #44357

Merged
merged 8 commits into from
Sep 15, 2017
Merged

[beta] Attempt to fix the component manifest problem for rls-preview #44357

merged 8 commits into from
Sep 15, 2017

Conversation

nrc
Copy link
Member

@nrc nrc commented Sep 5, 2017

cc #44270

see #44352

@rust-highfive
Copy link
Collaborator

r? @nikomatsakis

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

@rust-highfive
Copy link
Collaborator

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@nrc nrc mentioned this pull request Sep 5, 2017
Closed
@nrc
Copy link
Member Author

nrc commented Sep 5, 2017

@bors r=@alexcrichton p=10 (from #44352)

@bors
Copy link
Contributor

bors commented Sep 5, 2017

📌 Commit 76115f3 has been approved by @alexcrichton

@nrc nrc assigned alexcrichton and unassigned nikomatsakis Sep 5, 2017
@alexcrichton
Copy link
Member

@nrc want to include the beta bump as well by changing this line?

(that way a new beta will be released when this is merged)

@bors
Copy link
Contributor

bors commented Sep 5, 2017

⌛ Testing commit 76115f3ce9a83131eb7951649ed2f38ac6673a94 with merge 15c1035eb95cdfea4ec50afcb0104c8c94060234...

@bors
Copy link
Contributor

bors commented Sep 5, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

I wonder if --component-name is changing the name of the tarball?

@aidanhs aidanhs added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 7, 2017
@nrc
Copy link
Member Author

nrc commented Sep 7, 2017

The problem seems to be that the save-analysis data for std is missing. I thought we only produced that on nightly, which would explain things, but I couldn't find such a condition in the code.

@nrc
Copy link
Member Author

nrc commented Sep 7, 2017

I realise this doesn't explain why we only hit this bug with this patch though

@alexcrichton
Copy link
Member

@nrc you noted on IRC that you weren't able to reproduce locally, but I wonder if this is related to these lines?

rust/src/bootstrap/dist.rs

Lines 1282 to 1284 in 133aefc

cp_r(&work.join(&format!("{}-{}", pkgname(build, "rls"), target))
.join("rls"),
&exe.join("rls"));

That may explain the windows-specific-ness?

@bors
Copy link
Contributor

bors commented Sep 11, 2017

⌛ Testing commit 76115f3ce9a83131eb7951649ed2f38ac6673a94 with merge 6adfa7085021a556081fafb5b272ff9c6086c445...

@frewsxcv
Copy link
Member

why is bors testing this again? @bors retry r-

@nrc nrc force-pushed the rls-manifest-beta-2 branch from 76115f3 to e25513c Compare September 14, 2017 04:27
@nrc
Copy link
Member Author

nrc commented Sep 14, 2017

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Sep 14, 2017

📌 Commit e25513c has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Sep 14, 2017

⌛ Testing commit e25513c with merge 9637179...

bors added a commit that referenced this pull request Sep 14, 2017
@bors
Auto merge of #44357 - nrc:rls-manifest-beta-2, r=alexcrichton
9637179 
[beta] Attempt to fix the component manifest problem for rls-preview

cc #44270

see #44352
@bors
Copy link
Contributor

bors commented Sep 14, 2017

💔 Test failed - status-travis

@kennytm
Copy link
Member

kennytm commented Sep 14, 2017

dist-fuchsia errored, failed to deploy.

uploading "9637179c7c345460504fb7bf36636d7fb43d1d1f/rust-analysis-beta-aarch64-unknown-fuchsia.tar.gz" with {:content_type=>"application/gzip", :acl=>"public-read"}
Invalid S3 Access Key Id, Stopping Deploy
failed to deploy

@alexcrichton is #44385 (Rotate Travis/AppVeyor S3 keys) needed?

durka and others added 3 commits September 14, 2017 10:37
@durka @alexcrichton
stabilize mem::discriminant (closes rust-lang#24263)
c4474ab
@cuviper @alexcrichton
Include rustc in the default ./x.py install
0df9c54 
The default install used to include rustc, rust-std, and rust-docs, but
the refactoring in commit 6b3413d make rustc only default in
extended builds.  This commit makes rustc installed by default again.
@alexcrichton
Rotate Travis/AppVeyor S3 keys
27e18d3 
Haven't done this in awhile so seems like a good idea!
alexcrichton and others added 5 commits September 14, 2017 10:37
@alexcrichton
travis: Downgrade to previous images temporarily
65bf0e2 
Travis is in the process of [rolling out an update][update] but looks like our
tests are breaking, let's temporarily roll back to get the queue moving again.

[update]: https://blog.travis-ci.com/2017-08-29-trusty-image-updates
@alexcrichton
rustc: Spawn cmd /c emcc.bat explicitly
214abf2 
In rust-lang#42436 the behavior for spawning processes on Windows was tweaked slightly to
fix various bugs, but this caused rust-lang#42791 as a regression, namely that to spawn
batch scripts they need to be manually spawned with `cmd /c` instead now. This
updates the compiler to handle this case explicitly for Emscripten.

Closes rust-lang#42791
@durka @alexcrichton
update "since" for discriminant_value
6c6a2c1 
It's going to be backported to beta.
@nrc @alexcrichton
Attempt to fix the component manifest problem for rls-preview
45b426c 
cc rust-lang#44270
@alexcrichton
Bump beta to .3
25676e0
@alexcrichton
Copy link
Member

Yeah, I've now also hijacked this PR to bump the beta to .3 and backport these PRs:

@bors: r+

@bors
Copy link
Contributor

bors commented Sep 14, 2017

📌 Commit 25676e0 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Sep 14, 2017

⌛ Testing commit 25676e0 with merge e41812774ba102ef66137375008b6002527ce686...

@bors
Copy link
Contributor

bors commented Sep 14, 2017

💔 Test failed - status-appveyor

@alexcrichton
Copy link
Member

@bors: retry

  • s3 is down

@bors
Copy link
Contributor

bors commented Sep 15, 2017

⌛ Testing commit 25676e0 with merge ea1fd7d...

bors added a commit that referenced this pull request Sep 15, 2017
@bors
Auto merge of #44357 - nrc:rls-manifest-beta-2, r=alexcrichton
ea1fd7d 
[beta] Attempt to fix the component manifest problem for rls-preview

cc #44270

see #44352
@bors
Copy link
Contributor

bors commented Sep 15, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing ea1fd7d to beta...

@bors bors merged commit 25676e0 into rust-lang:beta Sep 15, 2017
@alexcrichton
Copy link
Member 

$ rls +beta
<never exits>

It works!

This was referenced Sep 15, 2017
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@nrc @rust-highfive @bors @alexcrichton @frewsxcv @kennytm @nikomatsakis @aidanhs @durka @cuviper