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

Upgrade to SpiderMonkey 66 #23163

Merged
merged 6 commits into from May 11, 2019

Conversation

Projects
None yet
6 participants
@jdm
Copy link
Member

commented Apr 4, 2019

This change is Reviewable

@highfive

This comment has been minimized.

Copy link

commented Apr 4, 2019

Heads up! This PR modifies the following files:

  • @asajeffrey: components/script/dom/bindings/utils.rs, components/script/dom/customelementregistry.rs, components/script/dom/filereader.rs, components/script/dom/window.rs, components/script/devtools.rs and 24 more
  • @KiChjang: components/script/dom/bindings/utils.rs, components/script/dom/customelementregistry.rs, components/script/dom/filereader.rs, components/script/dom/window.rs, components/script/devtools.rs and 24 more
  • @emilio: components/style/Cargo.toml
@highfive

This comment has been minimized.

Copy link

commented Apr 4, 2019

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify style and script code, but no tests are modified. Please consider adding a test!
@jdm

This comment has been minimized.

Copy link
Member Author

commented Apr 4, 2019

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Apr 4, 2019

⌛️ Trying commit 4c61c5d with merge 1da7b1b...

bors-servo added a commit that referenced this pull request Apr 4, 2019

Auto merge of #23163 - jdm:smup66, r=<try>
WIP Upgrade to SpiderMonkey 66

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23163)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Apr 4, 2019

💔 Test failed - linux-rel-wpt

@jdm

This comment has been minimized.

Copy link
Member Author

commented Apr 4, 2019

Linux needs newer GCC (possibly via xenial). Android:

  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/build/moz.configure/android-ndk.configure", line 127, in <module>
    @imports(_from='os.path', _import='isdir')
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 709, in decorator
    depends = DependsFunction(self, func, dependencies, when=when)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 123, in __init__
    sandbox._value_for(self)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 505, in _value_for
    return self._value_for_depends(obj)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/util.py", line 947, in method_call
    cache[args] = self.func(instance, *args)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 514, in _value_for_depends
    return obj.result()
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/util.py", line 947, in method_call
    cache[args] = self.func(instance, *args)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 149, in result
    return self._func(*resolved_args)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 1070, in wrapped
    return new_func(*args, **kwargs)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 767, in wrapper
    ret = template(*args, **kwargs)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/build/moz.configure/checks.configure", line 58, in wrapped
    ret = func(*args, **kwargs)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/8c937b8/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 1070, in wrapped
    return new_func(*args, **kwargs)
TypeError: android_platform() takes exactly 4 arguments (5 given)
make: *** [maybe-configure] Error 1
@jdm

This comment has been minimized.

Copy link
Member Author

commented Apr 4, 2019

No idea what happened on windows taskcluster:

[taskcluster 2019-04-04T20:51:14.020Z] [mounts] Downloaded 34358269 bytes with SHA256 37f0a533b0978a454efb5dc3bd3598becf9660aaf4287e55bf68ca6b527d051d from url https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip to downloads\PHUrwRPsQXKqJtTMC-MHzg
[taskcluster 2019-04-04T20:51:14.020Z] [mounts] Content from url https://github.com/wixtoolset/wix3/releases/download/wix3111rtm/wix311-binaries.zip (downloads\PHUrwRPsQXKqJtTMC-MHzg) matches required SHA256 37f0a533b0978a454efb5dc3bd3598becf9660aaf4287e55bf68ca6b527d051d
[taskcluster 2019-04-04T20:51:14.020Z] [mounts] Creating directory C:\Users\task_1554410985\wix with permissions 0700
[taskcluster 2019-04-04T20:51:14.020Z] [mounts] Extracting zip file downloads\PHUrwRPsQXKqJtTMC-MHzg to 'C:\Users\task_1554410985\wix'
[taskcluster 2019-04-04T20:51:15.019Z] Executing command 0: set PATH=%HOMEDRIVE%%HOMEPATH%\wix;%PATH%
[taskcluster 2019-04-04T20:51:15.030Z]    Exit Code: -2
[taskcluster 2019-04-04T20:51:15.030Z]    User Time: 0s
[taskcluster 2019-04-04T20:51:15.030Z]  Kernel Time: 0s
[taskcluster 2019-04-04T20:51:15.030Z]    Wall Time: 0s
[taskcluster 2019-04-04T20:51:15.030Z]       Result: SUCCEEDED
[taskcluster 2019-04-04T20:51:15.030Z] === Task Finished ===
[taskcluster 2019-04-04T20:51:15.030Z] Task Duration: 10.7326ms
[taskcluster:error] Uploading error artifact public/Servo.exe from file repo/target/debug/msi/Servo.exe with message "Could not read file 'C:\\Users\\task_1554410985\\repo\\target\\debug\\msi\\Servo.exe'", reason "file-missing-on-worker" and expiry 2020-04-03T20:40:07.149Z
[taskcluster:error] TASK FAILURE during artifact upload: file-missing-on-worker: Could not read file 'C:\Users\task_1554410985\repo\target\debug\msi\Servo.exe'
[taskcluster:error] Uploading error artifact public/Servo.zip from file repo/target/debug/msi/Servo.zip with message "Could not read file 'C:\\Users\\task_1554410985\\repo\\target\\debug\\msi\\Servo.zip'", reason "file-missing-on-worker" and expiry 2020-04-03T20:40:07.149Z
[taskcluster:error] TASK FAILURE during artifact upload: file-missing-on-worker: Could not read file 'C:\Users\task_1554410985\repo\target\debug\msi\Servo.zip'
[taskcluster 2019-04-04T20:51:16.277Z] Uploading redirect artifact public/logs/live.log to URL https://queue.taskcluster.net/v1/task/QYfmn3QcTgmg3f2o0qCEPQ/runs/0/artifacts/public/logs/live_backing.log with mime type "text/plain; charset=utf-8" and expiry 2020-04-03T20:40:07.149Z
[taskcluster:error] file-missing-on-worker: Could not read file 'C:\Users\task_1554410985\repo\target\debug\msi\Servo.exe'
[taskcluster:error] file-missing-on-worker: Could not read file 'C:\Users\task_1554410985\repo\target\debug\msi\Servo.zip'
[taskcluster:error] goroutine 1 [running]:
[taskcluster:error] runtime/debug.Stack(0xc042487530, 0x9218e0, 0xc0424d4090)
[taskcluster:error] 	/home/travis/.gimme/versions/go1.10.3.src/src/runtime/debug/stack.go:24 +0xae
[taskcluster:error] main.(*TaskRun).Run.func2(0xc0423ee170, 0xc04246d500, 0xc0423ee178)
[taskcluster:error] 	/home/travis/gopath/src/github.com/taskcluster/generic-worker/main.go:1202 +0x231
[taskcluster:error] panic(0x9218e0, 0xc0424d4090)
[taskcluster:error] 	/home/travis/.gimme/versions/go1.10.3.src/src/runtime/panic.go:502 +0x237
[taskcluster:error] main.(*TaskRun).ExecuteCommand(0xc04246d500, 0x0, 0xc04246d500)
[taskcluster:error] 	/home/travis/gopath/src/github.com/taskcluster/generic-worker/main.go:1067 +0x6d2
[taskcluster:error] main.(*TaskRun).Run(0xc04246d500, 0xc0422f5360)
[taskcluster:error] 	/home/travis/gopath/src/github.com/taskcluster/generic-worker/main.go:1362 +0x16bf
[taskcluster:error] main.RunWorker(0x0)
[taskcluster:error] 	/home/travis/gopath/src/github.com/taskcluster/generic-worker/main.go:748 +0xc9c
[taskcluster:error] main.main()
[taskcluster:error] 	/home/travis/gopath/src/github.com/taskcluster/generic-worker/main.go:472 +0xbda
[taskcluster:error] 
[taskcluster:error] &os.PathError{Op:"fork/exec", Path:"C:\\Users\\task_1554410985\\command_000000_wrapper.bat", Err:0x5}
[taskcluster:error] fork/exec C:\Users\task_1554410985\command_000000_wrapper.bat: Access is denied.
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Apr 11, 2019

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

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Apr 27, 2019

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

@jdm jdm force-pushed the jdm:smup66 branch from a69d2cd to c9d4072 Apr 30, 2019

@jdm

This comment has been minimized.

Copy link
Member Author

commented Apr 30, 2019

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Apr 30, 2019

⌛️ Trying commit c9d4072 with merge 588f10c...

bors-servo added a commit that referenced this pull request Apr 30, 2019

Auto merge of #23163 - jdm:smup66, r=<try>
WIP Upgrade to SpiderMonkey 66

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23163)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented Apr 30, 2019

💔 Test failed - linux-rel-wpt

@jdm

This comment has been minimized.

Copy link
Member Author

commented Apr 30, 2019

error: failed to run custom build command for `mozjs_sys v0.62.0 (https://github.com/servo/mozjs?branch=smup66#414de51d)`
process didn't exit successfully: `/repo/target/android/debug/build/mozjs_sys-d81baf58bb4baf18/build-script-build` (exit code: 101)
--- stdout
[[ /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure -ot /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure.in ]] && touch /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure || true
[[ /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/old-configure -ot /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/old-configure.in ]] && touch /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/old-configure || true
! [[ /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure.in -ot /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure ]] && touch /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure || true
! [[ /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/old-configure.in -ot /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/old-configure ]] && touch /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/old-configure || true
if [[ /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure -nt /repo/target/android/armv7-linux-androideabi/debug/build/mozjs_sys-3a889ead31726a81/out/config.status ]] ; then \
  cd /repo/target/android/armv7-linux-androideabi/debug/build/mozjs_sys-3a889ead31726a81/out && \
  PYTHON="" MOZ_TOOLS="" \
  CC="/repo/android-toolchains/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/clang" CFLAGS="--target=armv7-linux-androideabi --sysroot=/repo/android-toolchains/ndk/platforms/android-18/arch-arm --gcc-toolchain=/repo/android-toolchains/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64 -isystem /repo/android-toolchains/ndk/platforms/android-18/arch-arm/usr/include -L/repo/android-toolchains/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x" \
  CPP="/repo/android-toolchains/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/clang -E" CPPFLAGS="--sysroot /repo/android-toolchains/ndk/platforms/android-18/arch-arm" \
  CXX="/repo/android-toolchains/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/clang++" CXXFLAGS="--target=armv7-linux-androideabi --sysroot=/repo/android-toolchains/ndk/platforms/android-18/arch-arm --gcc-toolchain=/repo/android-toolchains/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64 -I/repo/android-toolchains/ndk/sources/android/support/include -I/repo/android-toolchains/ndk/sources/cxx-stl/llvm-libc++/libcxx/include -I/repo/android-toolchains/ndk/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/3.8/include -isystem /repo/android-toolchains/ndk/platforms/android-18/arch-arm/usr/include -L/repo/android-toolchains/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/lib/gcc/arm-linux-androideabi/4.9.x -D__STDC_CONSTANT_MACROS -D__NDK_FPABI__=" \
  AS="" AR="/repo/android-toolchains/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/arm-linux-androideabi/bin/ar" \
  STLPORT_LIBS="" \
  /root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/configure --disable-jemalloc --disable-js-shell --disable-tests --disable-shared-js --build-backends=RecursiveMake --with-arch=armv7-a --with-fpu=neon --with-android-ndk=/repo/android-toolchains/ndk --target=arm-linux-androideabi --disable-gold --with-ccache=sccache --disable-shared-js || (cat config.log && exit 1) ; \
fi
Creating Python environment
Using real prefix '/usr'
New python executable in /repo/target/android/armv7-linux-androideabi/debug/build/mozjs_sys-3a889ead31726a81/out/_virtualenvs/init/bin/python2.7
Also creating executable in /repo/target/android/armv7-linux-androideabi/debug/build/mozjs_sys-3a889ead31726a81/out/_virtualenvs/init/bin/python
Overwriting /repo/target/android/armv7-linux-androideabi/debug/build/mozjs_sys-3a889ead31726a81/out/_virtualenvs/init/lib/python2.7/distutils/__init__.py with new content
Installing setuptools, pip, wheel...done.
WARNING: Python.h not found. Install Python development headers.
Error processing command. Ignoring because optional. (optional:setup.py:third_party/python/psutil:build_ext:--inplace)
Error processing command. Ignoring because optional. (optional:packages.txt:comm/build/virtualenv_packages.txt)
Reexecuting in the virtualenv
checking for vcs source checkout... no
checking for a shell... /bin/sh
checking for host system type... x86_64-pc-linux-gnu
checking for target system type... arm-unknown-linux-androideabi
checking for android platform directory... INFO: checking for vcs source checkout... 
INFO: no
INFO: checking for a shell... 
INFO: /bin/sh
INFO: checking for host system type... 
INFO: x86_64-pc-linux-gnu
INFO: checking for target system type... 
INFO: arm-unknown-linux-androideabi
INFO: checking for android platform directory... 
makefile.cargo:178: recipe for target 'maybe-configure' failed
--- stderr
Traceback (most recent call last):
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/../../configure.py", line 124, in <module>
    sys.exit(main(sys.argv))
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/js/src/../../configure.py", line 30, in main
    sandbox.run(os.path.join(os.path.dirname(__file__), 'moz.configure'))
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 429, in run
    self.include_file(path)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 420, in include_file
    exec_(code, self)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/util.py", line 59, in exec_
    exec(object, globals, locals)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/moz.configure", line 127, in <module>
    when='--enable-compile-environment')
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 726, in include_impl
    self.include_file(what)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 420, in include_file
    exec_(code, self)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/util.py", line 59, in exec_
    exec(object, globals, locals)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/build/moz.configure/toolchain.configure", line 172, in <module>
    include('android-ndk.configure', when=compiling_android)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 726, in include_impl
    self.include_file(what)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 420, in include_file
    exec_(code, self)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/util.py", line 59, in exec_
    exec(object, globals, locals)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/build/moz.configure/android-ndk.configure", line 127, in <module>
    @imports(_from='os.path', _import='isdir')
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 709, in decorator
    depends = DependsFunction(self, func, dependencies, when=when)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 123, in __init__
    sandbox._value_for(self)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 505, in _value_for
    return self._value_for_depends(obj)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/util.py", line 947, in method_call
    cache[args] = self.func(instance, *args)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 514, in _value_for_depends
    return obj.result()
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/util.py", line 947, in method_call
    cache[args] = self.func(instance, *args)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 149, in result
    return self._func(*resolved_args)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 1070, in wrapped
    return new_func(*args, **kwargs)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 767, in wrapper
    ret = template(*args, **kwargs)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/build/moz.configure/checks.configure", line 58, in wrapped
    ret = func(*args, **kwargs)
  File "/root/.cargo/git/checkouts/mozjs-fa11ffc7d4f1cc2d/414de51/mozjs/python/mozbuild/mozbuild/configure/__init__.py", line 1070, in wrapped
    return new_func(*args, **kwargs)
TypeError: android_platform() takes exactly 4 arguments (5 given)
make: *** [maybe-configure] Error 1
@jdm

This comment has been minimized.

Copy link
Member Author

commented Apr 30, 2019

@jdm

This comment has been minimized.

Copy link
Member Author

commented May 10, 2019

@bors-servo r=asajeffrey

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 10, 2019

📌 Commit 86cdbed has been approved by asajeffrey

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 11, 2019

🔒 Merge conflict

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 11, 2019

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

@jdm jdm force-pushed the jdm:smup66 branch from 86cdbed to 7c1c1d9 May 11, 2019

@jdm

This comment has been minimized.

Copy link
Member Author

commented May 11, 2019

@bors-servo r=asajeffrey

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 11, 2019

📌 Commit 7c1c1d9 has been approved by asajeffrey

@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 11, 2019

⌛️ Testing commit 7c1c1d9 with merge d955949...

bors-servo added a commit that referenced this pull request May 11, 2019

Auto merge of #23163 - jdm:smup66, r=asajeffrey
Upgrade to SpiderMonkey 66

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/23163)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Copy link
Contributor

commented May 11, 2019

☀️ Test successful - android-mac, arm32, arm64, linux-rel-css, linux-rel-wpt, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, magicleap, status-taskcluster
Approved by: asajeffrey
Pushing d955949 to master...

@bors-servo bors-servo merged commit 7c1c1d9 into servo:master May 11, 2019

4 checks passed

Taskcluster (pull_request) TaskGroup: success
Details
Travis CI - Pull Request Build Passed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.