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 SM 60 #21029

Merged
merged 1 commit into from Aug 20, 2018

Conversation

@asajeffrey
Member

asajeffrey commented Jun 8, 2018

This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430.


  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #20585
  • These changes do not require tests because the existing tests will ensure SM is still working

This change is Reviewable

@highfive

This comment has been minimized.

highfive commented Jun 8, 2018

Heads up! This PR modifies the following files:

  • @KiChjang: components/script/dom/bindings/mozmap.rs, components/script/dom/bindings/constant.rs, components/script/dom/bindings/utils.rs, components/script/dom/window.rs, components/script/lib.rs and 20 more
@highfive

This comment has been minimized.

highfive commented Jun 8, 2018

warning Warning warning

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

This comment has been minimized.

Member

asajeffrey commented Jun 8, 2018

Servo running https://webassembly.org/demo/:

screenshot from 2018-06-07 15-27-39

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Jun 20, 2018

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

@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Jun 22, 2018

Rebased.

@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Jun 26, 2018

OK, lets see what happens.. @bors-servo try

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Jun 26, 2018

⌛️ Trying commit 5cb8457 with merge 8aca12e...

bors-servo added a commit that referenced this pull request Jun 26, 2018

Auto merge of #21029 - asajeffrey:smup, r=<try>
Upgrade to SM 60

<!-- Please describe your changes on the following line: -->

This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #20585
<!-- Either: -->
- [X] These changes do not require tests because the existing tests will ensure SM is still working

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/21029)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Jun 26, 2018

💔 Test failed - android

@jdm

This comment has been minimized.

Member

jdm commented Jun 26, 2018

I've pushed my almost-working NDK toolchain changes to:

The necessary change to mozjs_sys is:

diff --git a/makefile.cargo b/makefile.cargo
index f7be6532a0..5a0c314967 100644
--- a/makefile.cargo
+++ b/makefile.cargo
@@ -18,7 +18,10 @@ ifneq ($(HOST),$(TARGET))
                CONFIGURE_FLAGS += \
                        --with-arch=armv7-a \
                        --with-fpu=neon \
+                        --enable-linker=bfd \
                        $(NULL)
+                CFLAGS += --target=$(TARGET) -v
+                CXXFLAGS += --target=$(TARGET) -v
        endif

        ifeq (android,$(findstring android,$(TARGET)))

but the patch is impossible to upload on cottage wifi right now. /me disappears back on vacation.

@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Jun 26, 2018

Sigh... http://build.servo.org/builders/windows-msvc-dev/builds/7523

 ***
 * The source tree appears to have Windows-style line endings.
 *
 * If using Git, Git is likely configured to use Windows-style
 * line endings.
 *
 * To convert the working copy to UNIX-style line endings, run
 * the following:
 *
 * $ git config core.autocrlf false
 * $ git config core.eof lf
 * $ git rm --cached -r .
 * $ git reset --hard
 *
 * If not using Git, the tool you used to obtain the source
 * code likely converted files to Windows line endings. See
 * usage information for that tool for more.
 ***

caused by using a patch pointing to a git repo.

@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Jun 26, 2018

Linux builds are failing because of:

ERROR: Only GCC 4.9 or newer is supported (found version 4.8.5).

e.g. http://build.servo.org/builders/linux-rel-css/builds/9036

@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Jun 26, 2018

Mac builds are dying for a reason that I find mysterious...

/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(cwchar.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(icuplug.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(ucnv2022.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(ucnv_ct.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(ucnv_ext.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(ucnv_lmb.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(ucnvhz.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(ucnvisci.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(ucnvmbcs.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(wintz.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(anytrans.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(brktrans.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(casetrn.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(cpdtrans.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(esctrn.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(funcrepl.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(name2uni.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(nortrans.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(nultrans.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(quant.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(rbt.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(rbt_data.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(rbt_pars.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(rbt_rule.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(rbt_set.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(regexcmp.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(regeximp.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(regexst.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(rematch.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(remtrans.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(repattrn.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(strmatch.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(strrepl.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(titletrn.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(tolowtrn.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(toupptrn.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(translit.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(transreg.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(tridpars.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(unesctrn.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(uni2name.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(uregex.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(uregexc.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(uspoof_conf.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(utrans.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(windtfmt.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(winnmfmt.o) has no symbols
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ranlib: file: libjs_static.a(wintzimpl.o) has no symbols
/Users/servo/buildbot/slave/mac-rel-wpt4/build/target/release/build/mozjs_sys-af97d6bc69775bb4/out/dist/include/mozilla/Span.h:32:10: fatal error: 'array' file not found
/Users/servo/buildbot/slave/mac-rel-wpt4/build/target/release/build/mozjs_sys-af97d6bc69775bb4/out/dist/include/mozilla/Span.h:32:10: fatal error: 'array' file not found, err: true

e.g. http://build.servo.org/builders/mac-rel-wpt4/builds/4612

@emilio or @fitzgen have you seen errors like that before? This builds fine on travis mac, so it's probably some build config issue.

@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Jun 26, 2018

As @jdm says, the problem with the Android build is using an old toolchain:

ERROR: GCC is not supported on Android.
Please use clang from the Android NDK instead.

e.g. http://build.servo.org/builders/android/builds/11815

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Jun 30, 2018

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

@asajeffrey

This comment has been minimized.

Member

asajeffrey commented Jul 13, 2018

@bors-servo try

Let's see how much stuff breaks!

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Jul 13, 2018

⌛️ Trying commit 44486a4 with merge f705ee3...

bors-servo added a commit that referenced this pull request Jul 13, 2018

Auto merge of #21029 - asajeffrey:smup, r=<try>
Upgrade to SM 60

<!-- Please describe your changes on the following line: -->

This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #20585
<!-- Either: -->
- [X] These changes do not require tests because the existing tests will ensure SM is still working

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/21029)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Jul 13, 2018

💔 Test failed - android

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

⌛️ Testing commit 7a840b5 with merge 66472c8...

bors-servo added a commit that referenced this pull request Aug 20, 2018

Auto merge of #21029 - asajeffrey:smup, r=nox,manishearth
Upgrade to SM 60

<!-- Please describe your changes on the following line: -->

This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #20585
<!-- Either: -->
- [X] These changes do not require tests because the existing tests will ensure SM is still working

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/21029)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

💔 Test failed - linux-rel-wpt

@jdm

This comment has been minimized.

Member

jdm commented Aug 20, 2018

@bors-servo r=Manishearth,nox

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

📌 Commit 74c1e00 has been approved by Manishearth,nox

@highfive highfive assigned Manishearth and unassigned nox Aug 20, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

⌛️ Testing commit 74c1e00 with merge 5c8ede4...

bors-servo added a commit that referenced this pull request Aug 20, 2018

Auto merge of #21029 - asajeffrey:smup, r=Manishearth,nox
Upgrade to SM 60

<!-- Please describe your changes on the following line: -->

This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430.

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #20585
<!-- Either: -->
- [X] These changes do not require tests because the existing tests will ensure SM is still working

<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/21029)
<!-- Reviewable:end -->
@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

💔 Test failed - mac-rel-css1

@jdm

This comment has been minimized.

Member

jdm commented Aug 20, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

@bors-servo

This comment has been minimized.

Contributor

bors-servo commented Aug 20, 2018

☀️ Test successful - android, android-x86, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css1, mac-rel-css2, mac-rel-wpt1, mac-rel-wpt2, mac-rel-wpt3, mac-rel-wpt4, windows-msvc-dev
Approved by: Manishearth,nox
Pushing 5c8ede4 to master...

@bors-servo bors-servo merged commit 74c1e00 into servo:master Aug 20, 2018

2 of 3 checks passed

continuous-integration/appveyor/pr AppVeyor build failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@bors-servo bors-servo referenced this pull request Aug 20, 2018

Merged

Implement unhandledrejection event #20755

4 of 4 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment