servo / rust-mozjs

DEPRECATED - moved to servo/mozjs instead.
Mozilla Public License 2.0
293 stars 122 forks source link

Upgrade to SM 60 #430

Closed asajeffrey closed 6 years ago

asajeffrey commented 6 years ago

This is the mozjs_sys smup PR. Depends on https://github.com/servo/mozjs/pull/138.


This change is Reviewable

asajeffrey commented 6 years ago

Yay, the Travis Linux job is running, just Travis OSX and Appveyor to go!

asajeffrey commented 6 years ago

Squashed.

asajeffrey commented 6 years ago

The travis failures are https://github.com/rust-lang/rust/issues/51699.

bors-servo commented 6 years ago

:umbrella: The latest upstream changes (presumably #431) made this pull request unmergeable. Please resolve the merge conflicts.

asajeffrey commented 6 years ago

https://mozilla.logbot.info/servo/20180815#c15173056 @bors-servo r=jdm

bors-servo commented 6 years ago

:pushpin: Commit 5e838f4 has been approved by jdm

bors-servo commented 6 years ago

:hourglass: Testing commit 5e838f42e1b043ecd0d36782633401e64eed91ae with merge 8a33e811524851c785bf882607246090b74e2b8f...

bors-servo commented 6 years ago

:broken_heart: Test failed - status-travis

asajeffrey commented 6 years ago

@bors-servo retry

bors-servo commented 6 years ago

:hourglass: Testing commit 5e838f42e1b043ecd0d36782633401e64eed91ae with merge 04a7cf931d93f5ec6fee3effc4ecc98e3c7694b7...

bors-servo commented 6 years ago

:broken_heart: Test failed - status-travis

asajeffrey commented 6 years ago

@bors-servo retry

bors-servo commented 6 years ago

:hourglass: Testing commit 5e838f42e1b043ecd0d36782633401e64eed91ae with merge dd338dae9bb68fa0cf23d4da21afc10e0153b27c...

bors-servo commented 6 years ago

:sunny: Test successful - status-appveyor, status-travis Approved by: jdm Pushing dd338dae9bb68fa0cf23d4da21afc10e0153b27c to master...