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

Split old and experimental wasm builders #43175

Merged
merged 1 commit into from
Jul 14, 2017
Merged

Split old and experimental wasm builders #43175

merged 1 commit into from
Jul 14, 2017

Conversation

tlively
Copy link
Contributor

@tlively tlively commented Jul 12, 2017

#42784 introduced configuration errors in the wasm builder by mixing different versions of the tools. This PR separates the wasm32-unknown-emscripten and wasm32-experimental-emscripten builders to resolve these errors.

@rust-highfive
Copy link
Collaborator

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive assigned alexcrichton and unassigned brson Jul 12, 2017
@tlively
Copy link
Contributor Author

tlively commented Jul 12, 2017 •
edited
Loading

r? @alexcrichton

cc @eholk @vadimcn

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 12, 2017

📌 Commit 373e958 has been approved by alexcrichton

@aidanhs aidanhs added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jul 13, 2017
@bors
Copy link
Contributor

bors commented Jul 13, 2017

☔ The latest upstream changes (presumably #43129) made this pull request unmergeable. Please resolve the merge conflicts.

@alexcrichton alexcrichton added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 13, 2017
@tlively
Copy link
Contributor Author

tlively commented Jul 13, 2017

@alexcrichton updated

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Jul 13, 2017

📌 Commit 3bf8116 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Jul 14, 2017

⌛ Testing commit 3bf8116 with merge ae4803a...

bors added a commit that referenced this pull request Jul 14, 2017
@bors
Auto merge of #43175 - tlively:wasm-split-bots, r=alexcrichton
ae4803a 
Split old and experimental wasm builders

#42784 introduced configuration errors in the wasm builder by mixing different versions of the tools. This PR separates the wasm32-unknown-emscripten and wasm32-experimental-emscripten builders to resolve these errors.
@bors
Copy link
Contributor

bors commented Jul 14, 2017

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

@bors bors merged commit 3bf8116 into rust-lang:master Jul 14, 2017
@jonas-schievink jonas-schievink mentioned this pull request Jul 23, 2017
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.
6 participants
@tlively @rust-highfive @alexcrichton @bors @brson @aidanhs