Skip to content

try to fix the build on emscripten#40821

Merged
bors merged 2 commits into
rust-lang:masterfrom
arielb1:fix-emscripten
Mar 26, 2017
Merged

try to fix the build on emscripten#40821
bors merged 2 commits into
rust-lang:masterfrom
arielb1:fix-emscripten

Conversation

@arielb1

@arielb1 arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor

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

arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor Author

@bors p=10000

This is required for CI to make progress.

TimNN
TimNN reviewed Mar 25, 2017
View reviewed changes
Comment thread src/ci/docker/emscripten/build-emscripten.sh Outdated

@TimNN TimNN Mar 25, 2017

Copy link
Copy Markdown
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

TimNN commented Mar 25, 2017

Copy link
Copy Markdown
Contributor

(Also I think you forgot to r+).

@arielb1

arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor Author

I wanted someone else to look at this.

@bors r=TimNN

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 15297da has been approved by TimNN

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor Author

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

This was referenced Mar 25, 2017
Merged
Merged
Merged
@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@TimNN

TimNN commented Mar 25, 2017

Copy link
Copy Markdown
Contributor

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

arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor Author

@bors r=TimNN

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit ca85c40 has been approved by TimNN

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

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ca85c40 with merge 392888e...

This was referenced Mar 25, 2017
Merged
Merged
Merged
@arielb1

arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor Author

Mac builder is refusing to start
@bors retry

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ca85c40 with merge 106ca3c...

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@TimNN

TimNN commented Mar 25, 2017

Copy link
Copy Markdown
Contributor

@bors r+

@frewsxcv

frewsxcv commented Mar 25, 2017

Copy link
Copy Markdown
Contributor

@bors r=TimNN

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 935d84a has been approved by TimNN

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-appveyor

@arielb1

arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor Author

@bors retry p=0

@arielb1

arielb1 commented Mar 25, 2017

Copy link
Copy Markdown
Contributor Author

@bors p=5

@bors

bors commented Mar 25, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Mar 26, 2017

Copy link
Copy Markdown
Collaborator

☀️ 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

1 more reviewer
@TimNN TimNN TimNN left review comments
Reviewers whose approvals may not affect merge requirements

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