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.

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

Add asmjs/wasm32 to CI #742

Merged
merged 28 commits into from
Aug 27, 2017
Merged

Add asmjs/wasm32 to CI #742

merged 28 commits into from
Aug 27, 2017

Conversation

alexcrichton
Copy link
Member

Rebase of #610 and also move emscripten up much higher in the hierarchy to
ensure that it doesn't have too much of a ripple effect on other platforms.

This involved moving down a good number of definitions, but hopefully was done
with care to not break anything!

This was changed when emscripten test support was added
…ipten

Conflicts:
	Cargo.lock
	src/unix/notbsd/linux/mips/mod.rs
@rust-highfive
Copy link

@alexcrichton: no appropriate reviewer found, use r? to override

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 27, 2017

📌 Commit 70e4784 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 27, 2017

⌛ Testing commit 70e4784 with merge aca0886...

bors added a commit that referenced this pull request Aug 27, 2017
Add asmjs/wasm32 to CI

Rebase of #610 and also move emscripten up much higher in the hierarchy to
ensure that it doesn't have too much of a ripple effect on other platforms.

This involved moving down a good number of definitions, but hopefully was done
with care to not break anything!
Rebase of rust-lang#610 and also move emscripten up much higher in the hierarchy to
ensure that it doesn't have too much of a ripple effect on other platforms.

This involved moving down a good number of definitions, but hopefully was done
with care to not break anything!
@alexcrichton
Copy link
Member Author

@lilianmoraru

I searched for target_env = "musl" and I am curious if these don't need also target_os = "emscripten"(while the merge request was open, other structures were added):

Due to the way CI works we shouldn't need to worry about any of these, as CI would fail if any definition were inocorrect.

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 27, 2017

📌 Commit 5822645 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 27, 2017

⌛ Testing commit 5822645 with merge 1e833b9...

bors added a commit that referenced this pull request Aug 27, 2017
Add asmjs/wasm32 to CI

Rebase of #610 and also move emscripten up much higher in the hierarchy to
ensure that it doesn't have too much of a ripple effect on other platforms.

This involved moving down a good number of definitions, but hopefully was done
with care to not break anything!
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 27, 2017

📌 Commit f2ebd04 has been approved by alexcrichton

bors added a commit that referenced this pull request Aug 27, 2017
Add asmjs/wasm32 to CI

Rebase of #610 and also move emscripten up much higher in the hierarchy to
ensure that it doesn't have too much of a ripple effect on other platforms.

This involved moving down a good number of definitions, but hopefully was done
with care to not break anything!
@bors
Copy link
Contributor

bors commented Aug 27, 2017

⌛ Testing commit f2ebd04 with merge 3713825...

@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Aug 27, 2017

📌 Commit 305cec3 has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Aug 27, 2017

⌛ Testing commit 305cec3 with merge d647164...

bors added a commit that referenced this pull request Aug 27, 2017
Add asmjs/wasm32 to CI

Rebase of #610 and also move emscripten up much higher in the hierarchy to
ensure that it doesn't have too much of a ripple effect on other platforms.

This involved moving down a good number of definitions, but hopefully was done
with care to not break anything!
@lilianmoraru
Copy link

@alexcrichton You repeated the merge/rebase? That must of been painful :)
Thanks!

@bors
Copy link
Contributor

bors commented Aug 27, 2017

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

@bors bors merged commit 305cec3 into rust-lang:master Aug 27, 2017
@bors bors mentioned this pull request Aug 27, 2017
@alexcrichton alexcrichton deleted the wasm branch August 27, 2017 17:31
@lilianmoraru
Copy link

@alexcrichton Big thanks for finishing this up!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants