216044 2020-09-01 11:18:27 -0700 [Flatpak SDK] Adapt clean-webkit script to flatpak 2020-09-01 21:51:14 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 dpino dpino pnormand webkit-bug-importer oldest_to_newest 1684554 0 dpino 2020-09-01 11:18:27 -0700 [Flatpak SDK] Adapt clean-webkit script to flatpak 1684556 1 407700 dpino 2020-09-01 11:19:49 -0700 Created attachment 407700 Patch 1684557 2 dpino 2020-09-01 11:25:59 -0700 This script, clean-webkit, is used by the EWS in the 'unapply-patch' step. See: https://ews-build.webkit-uat.org/#/builders/34/builds/4962 When passing the '--keep-jhbuild-directory' knob the script deletes everything inside 'WebKitBuild/' except 'DependenciesGTK/' and 'DependenciesWPE/'. Since the EWS bots are using Flatpak, the script removes everything inside 'WebKitBuild/' and the following step 'compile-webkit-without-patch' fails because libwpe dependency is missing. 1684722 3 ews-feeder 2020-09-01 21:50:39 -0700 Committed r266450: <https://trac.webkit.org/changeset/266450> All reviewed patches have been landed. Closing bug and clearing flags on attachment 407700. 1684723 4 webkit-bug-importer 2020-09-01 21:51:14 -0700 <rdar://problem/68186945> 407700 2020-09-01 11:19:49 -0700 2020-09-01 21:50:39 -0700 Patch bug-216044-20200901201948.patch text/plain 2726 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2Mzk5CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTBiYjhiODY5ZGY4MTdjMTQ2ZjczYWJiZTFiMDM5YzE2 OTMzYmQwMy4uYzJmZDhlYzMxMzc4ZTlkOTM5NDI3YjJiYTVlM2M5ZjA2N2NmOGYxZCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4 IEBACisyMDIwLTA5LTAxICBEaWVnbyBQaW5vIEdhcmNpYSAgPGRwaW5vQGlnYWxpYS5jb20+CisK KyAgICAgICAgW0ZsYXRwYWsgU0RLXSBBZGFwdCBjbGVhbi13ZWJraXQgc2NyaXB0IHRvIGZsYXRw YWsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxNjA0 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEtlZXAg cmVsZXZhbnQgZGlyZWN0b3JpZXMgaW4gV2ViS2l0QnVpbGQvIHdoZW4gdXNpbmcgZmxhdHBhay4K KworICAgICAgICAqIFNjcmlwdHMvY2xlYW4td2Via2l0OgorICAgICAgICAodXNlc0ZsYXRwYWsp OgorICAgICAgICAobGlzdFdlYktpdEJ1aWxkRmlsZXMpOgorICAgICAgICAocmVtb3ZlRmlsZXMp OgorICAgICAgICAobWFpbik6CisKIDIwMjAtMDktMDEgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hy aXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBVcGRhdGUgVVJMIGZyYWdtZW50IHBlcmNl bnQgZW5jb2RlIHNldApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9jbGVhbi13ZWJraXQgYi9U b29scy9TY3JpcHRzL2NsZWFuLXdlYmtpdAppbmRleCAzOGY1MWFjYjkzZWQyNTBjYzFiNDNmMGM0 M2Q3MGVjNzY1MDQ1YzU0Li40ZTg5MTk3MzBhMDNkOWVlNTdhOWI4MjA3ZjcwMTRiMzZlYWFiNWNi IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2NsZWFuLXdlYmtpdAorKysgYi9Ub29scy9TY3Jp cHRzL2NsZWFuLXdlYmtpdApAQCAtMjksMTEgKzI5LDI5IEBACiAKIGltcG9ydCBzeXMKIGltcG9y dCBhcmdwYXJzZQoraW1wb3J0IG9zCiAKIGZyb20gd2Via2l0cHkuY29tbW9uLmNoZWNrb3V0LnNj bS5kZXRlY3Rpb24gaW1wb3J0IFNDTURldGVjdG9yCiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5ob3N0 IGltcG9ydCBIb3N0CiBmcm9tIHdlYmtpdHB5LmNvbW1vbi5zeXN0ZW0uZmlsZXN5c3RlbSBpbXBv cnQgRmlsZVN5c3RlbQogCitkZWYgdXNlc0ZsYXRwYWsoKToKKyAgICByZXR1cm4gbm90IG9zLmVu dmlyb24uZ2V0KCdXRUJLSVRfSkhCVUlMRCcpIG9yIG9zLmVudmlyb24uZ2V0KCdXRUJLSVRfSkhC VUlMRCcpID09ICcwJworCitkZWYgbGlzdFdlYktpdEJ1aWxkRmlsZXMoZnMpOgorICAgIHJldCA9 IFtdCisgICAgaWYgZnMuaXNkaXIoIldlYktpdEJ1aWxkIik6CisgICAgICAgIGZvciBidWlsZF9k aXIgaW4gZnMubGlzdGRpcigiV2ViS2l0QnVpbGQiKToKKyAgICAgICAgICAgIGJ1aWxkX3BhdGgg PSBmcy5qb2luKCJXZWJLaXRCdWlsZCIsIGJ1aWxkX2RpcikKKyAgICAgICAgICAgIHJldC5hcHBl bmQoYnVpbGRfcGF0aCkKKyAgICByZXR1cm4gcmV0CisKK2RlZiByZW1vdmVGaWxlcyhsKToKKyAg ICBmb3IgZWFjaCBpbiBsOgorICAgICAgICBpZiBmcy5pc2RpcihlYWNoKToKKyAgICAgICAgICAg IGZzLnJtdHJlZShlYWNoKQorICAgICAgICBlbHNlOgorICAgICAgICAgICAgZnMucmVtb3ZlKGVh Y2gpCiAKIGRlZiBtYWluKGFyZ3MpOgogICAgIGZzID0gRmlsZVN5c3RlbSgpCkBAIC00NiwxMyAr NjQsMTAgQEAgZGVmIG1haW4oYXJncyk6CiAgICAgICAgICMgQ2xlYW4gZXZlcnl0aGluZyBpbnNp ZGUgV2ViS2l0QnVpbGQsIGV4Y2VwdCB0aGUgSkhCdWlsZCBkaXJlY3Rvcmllcy4KICAgICAgICAg c2NtLmRpc2NhcmRfdW50cmFja2VkX2ZpbGVzKGRpc2NhcmRfaWdub3JlZF9maWxlcz1UcnVlLCBr ZWVwX3dlYmtpdGJ1aWxkX2RpcmVjdG9yeT1UcnVlKQogICAgICAgICBpZiBmcy5pc2RpcigiV2Vi S2l0QnVpbGQiKToKLSAgICAgICAgICAgIGZvciBidWlsZF9kaXIgaW4gZnMubGlzdGRpcigiV2Vi S2l0QnVpbGQiKToKLSAgICAgICAgICAgICAgICBidWlsZF9wYXRoID0gZnMuam9pbigiV2ViS2l0 QnVpbGQiLCBidWlsZF9kaXIpCi0gICAgICAgICAgICAgICAgaWYgZnMuaXNkaXIoYnVpbGRfcGF0 aCk6Ci0gICAgICAgICAgICAgICAgICAgIGlmIGJ1aWxkX2RpciBub3QgaW4gWyJEZXBlbmRlbmNp ZXNHVEsiLCAiRGVwZW5kZW5jaWVzV1BFIl06Ci0gICAgICAgICAgICAgICAgICAgICAgICBmcy5y bXRyZWUoYnVpbGRfcGF0aCkKLSAgICAgICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAg ICAgICBmcy5yZW1vdmUoYnVpbGRfcGF0aCkKKyAgICAgICAgICAgIGZpbGVzID0gbGlzdFdlYktp dEJ1aWxkRmlsZXMoZnMpCisgICAgICAgICAgICBrZWVwRGlycyA9IHVzZXNGbGF0cGFrKCkgYW5k IFsiVG9vbGNoYWlucyIsICJVc2VyRmxhdHBhayJdIG9yIFsiRGVwZW5kZW5jaWVzR1RLIiwgIkRl cGVuZGVuY2llc1dQRSJdCisgICAgICAgICAgICBmaWxlcyA9IGZpbHRlcihsYW1iZGEgcGF0aDog cGF0aFtsZW4oIldlYktpdEJ1aWxkLyIpOl0gbm90IGluIGtlZXBEaXJzLCBmaWxlcykKKyAgICAg ICAgICAgIHJlbW92ZUZpbGVzKGZpbGVzKQogICAgIGVsc2U6CiAgICAgICAgIHNjbS5kaXNjYXJk X3VudHJhY2tlZF9maWxlcyhkaXNjYXJkX2lnbm9yZWRfZmlsZXM9VHJ1ZSkKIAo=