Skip to content

Split old and experimental wasm builders - #43175

Merged
bors merged 1 commit into
rust-lang:masterfrom
tlively:wasm-split-bots
Jul 14, 2017
Merged

Split old and experimental wasm builders#43175
bors merged 1 commit into
rust-lang:masterfrom
tlively:wasm-split-bots

Conversation

@tlively

@tlivelytlively commented Jul 12, 2017

Copy link
Copy Markdown
Contributor

#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

rust-highfive commented Jul 12, 2017

Copy link
Copy Markdown
Contributor

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.

@tlively

tlively commented Jul 12, 2017•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

r? @alexcrichton

cc @eholk@vadimcn

@alexcrichton

alexcrichton commented Jul 12, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 12, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 373e958 has been approved by alexcrichton

@aidanhsaidanhs 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

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

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

@alexcrichtonalexcrichton 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

tlively commented Jul 13, 2017

Copy link
Copy Markdown
ContributorAuthor

@alexcrichton updated

@alexcrichton

alexcrichton commented Jul 13, 2017

Copy link
Copy Markdown
Member

@bors: r+

@bors

bors commented Jul 13, 2017

Copy link
Copy Markdown
Collaborator

📌 Commit 3bf8116 has been approved by alexcrichton

@bors

bors commented Jul 14, 2017

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Jul 14, 2017

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 3bf8116 into rust-lang:masterJul 14, 2017
@jonas-schievinkjonas-schievink mentioned this pull request Jul 23, 2017
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

S-waiting-on-authorStatus: 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