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

try to fix the build on emscripten #40821

Merged
merged 2 commits into from
Mar 26, 2017
Merged

try to fix the build on emscripten #40821

merged 2 commits into from
Mar 26, 2017

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Mar 25, 2017

The "upstream" emscripten tar.gz now extracts to emsdk-portable instead of emsdk_portable, breaking our CI. It might be better to vendor a specific version of emscripten instead of using the latest, but I could not find a good way of doing that.

r? @alexcrichton

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 25, 2017

@bors p=10000

This is required for CI to make progress.

TimNN
TimNN reviewed Mar 25, 2017
View reviewed changes
src/ci/docker/emscripten/build-emscripten.sh Outdated
source emsdk_portable/emsdk_env.sh
if [ -d emsdk_portable ]; then
EMSDK_DIR=emsdk_portable
else if [ -d emsdk-portable ]; then
Copy link
Contributor

Choose a reason for hiding this comment

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

This could be an elif I think (you wouldn't need the second fi then).

@TimNN
Copy link
Contributor

TimNN commented Mar 25, 2017

(Also I think you forgot to r+).

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 25, 2017

I wanted someone else to look at this.

@bors r=TimNN

@bors
Copy link
Contributor

bors commented Mar 25, 2017

📌 Commit 15297da has been approved by TimNN

@bors
Copy link
Contributor

bors commented Mar 25, 2017

⌛ Testing commit 15297da with merge ded4413...

This was referenced Mar 25, 2017
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@arielb1 arielb1 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Mar 25, 2017
@arielb1
Copy link
Contributor Author

arielb1 commented Mar 25, 2017

Beta-nominating because this is needed for new beta PRs to succeed.

This was referenced Mar 25, 2017
Merged
Merged
Merged
@bors
Copy link
Contributor

bors commented Mar 25, 2017

💔 Test failed - status-travis

@TimNN
Copy link
Contributor

TimNN commented Mar 25, 2017

Ah, I think the paths in the corresponding Dockerfile need to be adjusted as well.

Maybe the better fix here is to just rename the directory, if the name is not what we expect?

@arielb1
travis: try to fix the build on emscripten
ca85c40 
The emsdk-portable .tar.gz now extracts to emsdk-portable instead of
emsdk_portable. Handle that.
@arielb1
Copy link
Contributor Author

arielb1 commented Mar 25, 2017

@bors r=TimNN

@bors
Copy link
Contributor

bors commented Mar 25, 2017

📌 Commit ca85c40 has been approved by TimNN

@arielb1 arielb1 mentioned this pull request Mar 25, 2017
Merged
@bors
Copy link
Contributor

bors commented Mar 25, 2017

⌛ Testing commit ca85c40 with merge 392888e...

This was referenced Mar 25, 2017
Merged
Merged
Merged
@arielb1
Copy link
Contributor Author

arielb1 commented Mar 25, 2017

Mac builder is refusing to start
@bors retry

@bors
Copy link
Contributor

bors commented Mar 25, 2017

⌛ Testing commit ca85c40 with merge 106ca3c...

@bors
Copy link
Contributor

bors commented Mar 25, 2017

💔 Test failed - status-travis

@TimNN
Copy link
Contributor

TimNN commented Mar 25, 2017

@bors r+

@frewsxcv
Copy link
Member

@bors r=TimNN

@bors
Copy link
Contributor

bors commented Mar 25, 2017

📌 Commit 935d84a has been approved by TimNN

@bors
Copy link
Contributor

bors commented Mar 25, 2017

⌛ Testing commit 935d84a with merge 584d103...

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Mar 25, 2017
@frewsxcv
Rollup merge of rust-lang#40821 - arielb1:fix-emscripten, r=TimNN
dc52625 
try to fix the build on emscripten

The "upstream" emscripten tar.gz now extracts to `emsdk-portable` instead of `emsdk_portable`, breaking our CI. It might be better to vendor a specific version of emscripten instead of using the latest, but I could not find a good way of doing that.

r? @alexcrichton
@frewsxcv frewsxcv mentioned this pull request Mar 25, 2017
Merged
@bors
Copy link
Contributor

bors commented Mar 25, 2017

💔 Test failed - status-appveyor

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 25, 2017

@bors retry p=0

@arielb1
Copy link
Contributor Author

arielb1 commented Mar 25, 2017

@bors p=5

@bors
Copy link
Contributor

bors commented Mar 25, 2017

⌛ Testing commit 935d84a with merge 0e4b4eb...

bors added a commit that referenced this pull request Mar 25, 2017
@bors
Auto merge of #40821 - arielb1:fix-emscripten, r=TimNN
0e4b4eb 
try to fix the build on emscripten

The "upstream" emscripten tar.gz now extracts to `emsdk-portable` instead of `emsdk_portable`, breaking our CI. It might be better to vendor a specific version of emscripten instead of using the latest, but I could not find a good way of doing that.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Mar 26, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: TimNN
Pushing 0e4b4eb to master...

@bors bors merged commit 935d84a into rust-lang:master Mar 26, 2017
bors added a commit that referenced this pull request Mar 26, 2017
@bors
Auto merge of #40826 - frewsxcv:rollup, r=frewsxcv
7846dbe 
Rollup of 7 pull requests

- Successful merges: #40642, #40734, #40740, #40771, #40807, #40820, #40821
- Failed merges:
@alexcrichton alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Apr 1, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TimNN TimNN TimNN left review comments

Assignees

@alexcrichton alexcrichton

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@arielb1 @TimNN @bors @frewsxcv @alexcrichton