221798 2021-02-11 17:59:16 -0800 [build.webkit.org] commit identifier should show main instead of trunk 2021-02-12 10:07:18 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 aakash_jain aakash_jain ap jbedard ryanhaddad webkit-bug-importer oldest_to_newest 1728397 0 aakash_jain 2021-02-11 17:59:16 -0800 We added commit identifier on build.webkit.org in https://commits.webkit.org/r272743. e.g.: https://build.webkit.org/#/builders/43/builds/125 It says xxx@trunk, instead it would be better to say xxx@main (to maintain consistency with ews). 1728398 1 420074 aakash_jain 2021-02-11 18:00:33 -0800 Created attachment 420074 Patch 1728422 2 ap 2021-02-11 19:29:31 -0800 Will either or both forms continue to work into the future indefinitely? 1728426 3 aakash_jain 2021-02-11 19:48:59 -0800 (In reply to Alexey Proskuryakov from comment #2) > Will either or both forms continue to work into the future indefinitely? I believe, yes (for both forms). Jonathan might know better. But I haven’t heard of any plan or any reason to discontinue them. Typically trunk is for svn, and main is for git. So main is definitely going to continue to work into the future indefinitely. 1728566 4 jbedard 2021-02-12 08:49:08 -0800 (In reply to Alexey Proskuryakov from comment #2) > Will either or both forms continue to work into the future indefinitely? Both forms will continue to work in anything derived from webkitscmpy (along with master). Notably, that is git-webkit and commits.webkit.org. The code that makes this work is not specific to the WebKit repository, it's a more general aliasing of common default branch names. 1728582 5 ews-feeder 2021-02-12 09:12:42 -0800 commit-queue failed to commit attachment 420074 to WebKit repository. To retry, please set cq+ flag again. 1728599 6 aakash_jain 2021-02-12 09:31:51 -0800 5 minute timeout doesn't seems to be enough (for initial run to cache things) on windows bots, e.g.: https://build.webkit.org/#/builders/67/builds/197 1728601 7 420136 aakash_jain 2021-02-12 09:32:57 -0800 Created attachment 420136 Patch 1728620 8 ews-feeder 2021-02-12 10:06:10 -0800 Committed r272785: <https://commits.webkit.org/r272785> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420136. 1728621 9 webkit-bug-importer 2021-02-12 10:07:18 -0800 <rdar://problem/74280945> 420074 2021-02-11 18:00:33 -0800 2021-02-12 09:32:54 -0800 Patch bug-221798-20210211210032.patch text/plain 3565 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3Mjc2MykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDIxLTAyLTExICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gY29tbWl0IGlkZW50aWZpZXIgc2hvdWxk IHNob3cgbWFpbiBpbnN0ZWFkIG9mIHRydW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE3OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIENJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5 OgorICAgICAgICAoU2hvd0lkZW50aWZpZXIuX19pbml0X18pOgorICAgICAgICAoU2hvd0lkZW50 aWZpZXIuZXZhbHVhdGVDb21tYW5kKToKKyAgICAgICAgKiBDSVN1cHBvcnQvYnVpbGQtd2Via2l0 LW9yZy9zdGVwc191bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RTaG93SWRlbnRpZmllci50ZXN0 X3N1Y2Nlc3MpOgorICAgICAgICAoVGVzdFNob3dJZGVudGlmaWVyLnRlc3RfZmFpbHVyZSk6CisK IDIwMjEtMDItMTEgIERvbiBPbG1zdGVhZCAgPGRvbi5vbG1zdGVhZEBzb255LmNvbT4KIAogICAg ICAgICBbUHl0aG9uLTNdIFVwZGF0ZSBweWxpbnQgdmVyc2lvbgpJbmRleDogVG9vbHMvQ0lTdXBw b3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ0lTdXBw b3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkJKHJldmlzaW9uIDI3Mjc2MykKKysrIFRvb2xz L0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0x MTM0LDcgKzExMzQsNyBAQCBjbGFzcyBTaG93SWRlbnRpZmllcihzaGVsbC5TaGVsbENvbW1hbmQp CiAgICAgaGFsdE9uRmFpbHVyZSA9IEZhbHNlCiAKICAgICBkZWYgX19pbml0X18oc2VsZiwgKipr d2FyZ3MpOgotICAgICAgICBzaGVsbC5TaGVsbENvbW1hbmQuX19pbml0X18oc2VsZiwgdGltZW91 dD0yICogNjAsIGxvZ0Vudmlyb249RmFsc2UsICoqa3dhcmdzKQorICAgICAgICBzaGVsbC5TaGVs bENvbW1hbmQuX19pbml0X18oc2VsZiwgdGltZW91dD01ICogNjAsIGxvZ0Vudmlyb249RmFsc2Us ICoqa3dhcmdzKQogCiAgICAgZGVmIHN0YXJ0KHNlbGYpOgogICAgICAgICBzZWxmLmxvZ19vYnNl cnZlciA9IGxvZ29ic2VydmVyLkJ1ZmZlckxvZ09ic2VydmVyKCkKQEAgLTExNTIsNiArMTE1Miw4 IEBAIGNsYXNzIFNob3dJZGVudGlmaWVyKHNoZWxsLlNoZWxsQ29tbWFuZCkKICAgICAgICAgbWF0 Y2ggPSByZS5zZWFyY2goc2VsZi5pZGVudGlmaWVyX3JlLCBsb2dfdGV4dCwgcmUuTVVMVElMSU5F KQogICAgICAgICBpZiBtYXRjaDoKICAgICAgICAgICAgIGlkZW50aWZpZXIgPSBtYXRjaC5ncm91 cCgxKQorICAgICAgICAgICAgaWYgaWRlbnRpZmllcjoKKyAgICAgICAgICAgICAgICBpZGVudGlm aWVyID0gaWRlbnRpZmllci5yZXBsYWNlKCd0cnVuaycsICdtYWluJykKICAgICAgICAgICAgIHNl bGYuc2V0UHJvcGVydHkoJ2lkZW50aWZpZXInLCBpZGVudGlmaWVyKQogICAgICAgICAgICAgc3Rl cCA9IHNlbGYuZ2V0TGFzdEJ1aWxkU3RlcEJ5TmFtZShDaGVja091dFNvdXJjZS5uYW1lKQogICAg ICAgICAgICAgaWYgbm90IHN0ZXA6CkluZGV4OiBUb29scy9DSVN1cHBvcnQvYnVpbGQtd2Via2l0 LW9yZy9zdGVwc191bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DSVN1cHBvcnQvYnVp bGQtd2Via2l0LW9yZy9zdGVwc191bml0dGVzdC5weQkocmV2aXNpb24gMjcyNzYzKQorKysgVG9v bHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHkJKHdvcmtpbmcg Y29weSkKQEAgLTUxMSwxNSArNTExLDE1IEBAIGNsYXNzIFRlc3RTaG93SWRlbnRpZmllcihCdWls ZFN0ZXBNaXhpbkEKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnZ290X3JldmlzaW9uJywgJzI3 MjY5MicpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAgICAgICBF eHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCi0gICAgICAgICAgICAgICAgICAgICAgICB0aW1l b3V0PTEyMCwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQ9MzAwLAogICAgICAgICAg ICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAgICAgICAgICAg IGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0JywgJ2ZpbmQnLCAn cjI3MjY5MiddKSArCi0gICAgICAgICAgICBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywgc3Rkb3V0 PSdJZGVudGlmaWVyOiAyMzM5MzlAdHJ1bmsnKSArCisgICAgICAgICAgICBFeHBlY3RTaGVsbC5s b2coJ3N0ZGlvJywgc3Rkb3V0PSdJZGVudGlmaWVyOiAyMzM5MzlAbWFpbicpICsKICAgICAgICAg ICAgIDAsCiAgICAgICAgICkKLSAgICAgICAgc2VsZi5leHBlY3RPdXRjb21lKHJlc3VsdD1TVUND RVNTLCBzdGF0ZV9zdHJpbmc9J0lkZW50aWZpZXI6IDIzMzkzOUB0cnVuaycpCisgICAgICAgIHNl bGYuZXhwZWN0T3V0Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdJZGVudGlmaWVy OiAyMzM5MzlAbWFpbicpCiAgICAgICAgIHJjID0gc2VsZi5ydW5TdGVwKCkKLSAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzZWxmLmdldFByb3BlcnR5KCdpZGVudGlmaWVyJyksICcyMzM5MzlAdHJ1 bmsnKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHNlbGYuZ2V0UHJvcGVydHkoJ2lkZW50aWZp ZXInKSwgJzIzMzkzOUBtYWluJykKICAgICAgICAgcmV0dXJuIHJjCiAKICAgICBkZWYgdGVzdF9m YWlsdXJlKHNlbGYpOgpAQCAtNTI3LDcgKzUyNyw3IEBAIGNsYXNzIFRlc3RTaG93SWRlbnRpZmll cihCdWlsZFN0ZXBNaXhpbkEKICAgICAgICAgc2VsZi5zZXRQcm9wZXJ0eSgnZ290X3JldmlzaW9u JywgJzI3MjY5MicpCiAgICAgICAgIHNlbGYuZXhwZWN0UmVtb3RlQ29tbWFuZHMoCiAgICAgICAg ICAgICBFeHBlY3RTaGVsbCh3b3JrZGlyPSd3a2RpcicsCi0gICAgICAgICAgICAgICAgICAgICAg ICB0aW1lb3V0PTEyMCwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVvdXQ9MzAwLAogICAg ICAgICAgICAgICAgICAgICAgICAgbG9nRW52aXJvbj1GYWxzZSwKICAgICAgICAgICAgICAgICAg ICAgICAgIGNvbW1hbmQ9WydweXRob24nLCAnVG9vbHMvU2NyaXB0cy9naXQtd2Via2l0JywgJ2Zp bmQnLCAncjI3MjY5MiddKSArCiAgICAgICAgICAgICBFeHBlY3RTaGVsbC5sb2coJ3N0ZGlvJywg c3Rkb3V0PSdVbmV4cGVjdGVkIGZhaWx1cmUnKSArCg== 420136 2021-02-12 09:32:57 -0800 2021-02-12 10:06:11 -0800 Patch bug-221798-20210212123255.patch text/plain 3590 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3Mjc4MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIxLTAyLTEyICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBbYnVpbGQud2Via2l0Lm9yZ10gY29tbWl0IGlkZW50aWZpZXIgc2hvdWxk IHNob3cgbWFpbiBpbnN0ZWFkIG9mIHRydW5rCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE3OTgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIENJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBzLnB5 OgorICAgICAgICAoU2hvd0lkZW50aWZpZXIuX19pbml0X18pOiBJbmNyZWFzZWQgdGltZW91dCB0 byAxMCBtaW51dGVzIChzaW5jZSBmaXJzdCBydW4gbWlnaHQgdGFrZSBhIHdoaWxlKS4KKyAgICAg ICAgKFNob3dJZGVudGlmaWVyLmV2YWx1YXRlQ29tbWFuZCk6CisgICAgICAgICogQ0lTdXBwb3J0 L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHk6IFVwZGF0ZWQgdW5pdC10ZXN0cy4K KwogMjAyMS0wMi0xMiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAg ICAgICAgW3dlYmtpdC1wYXRjaF0gVXNlIGlkZW50aWZpZXJzIHdoZW4gcG9zdGluZyB0byBidWd6 aWxsYQpJbmRleDogVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHMucHkJKHJl dmlzaW9uIDI3Mjc4MikKKysrIFRvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0ZXBz LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTM0LDcgKzExMzQsNyBAQCBjbGFzcyBTaG93SWRlbnRp ZmllcihzaGVsbC5TaGVsbENvbW1hbmQpCiAgICAgaGFsdE9uRmFpbHVyZSA9IEZhbHNlCiAKICAg ICBkZWYgX19pbml0X18oc2VsZiwgKiprd2FyZ3MpOgotICAgICAgICBzaGVsbC5TaGVsbENvbW1h bmQuX19pbml0X18oc2VsZiwgdGltZW91dD0yICogNjAsIGxvZ0Vudmlyb249RmFsc2UsICoqa3dh cmdzKQorICAgICAgICBzaGVsbC5TaGVsbENvbW1hbmQuX19pbml0X18oc2VsZiwgdGltZW91dD0x MCAqIDYwLCBsb2dFbnZpcm9uPUZhbHNlLCAqKmt3YXJncykKIAogICAgIGRlZiBzdGFydChzZWxm KToKICAgICAgICAgc2VsZi5sb2dfb2JzZXJ2ZXIgPSBsb2dvYnNlcnZlci5CdWZmZXJMb2dPYnNl cnZlcigpCkBAIC0xMTUyLDYgKzExNTIsOCBAQCBjbGFzcyBTaG93SWRlbnRpZmllcihzaGVsbC5T aGVsbENvbW1hbmQpCiAgICAgICAgIG1hdGNoID0gcmUuc2VhcmNoKHNlbGYuaWRlbnRpZmllcl9y ZSwgbG9nX3RleHQsIHJlLk1VTFRJTElORSkKICAgICAgICAgaWYgbWF0Y2g6CiAgICAgICAgICAg ICBpZGVudGlmaWVyID0gbWF0Y2guZ3JvdXAoMSkKKyAgICAgICAgICAgIGlmIGlkZW50aWZpZXI6 CisgICAgICAgICAgICAgICAgaWRlbnRpZmllciA9IGlkZW50aWZpZXIucmVwbGFjZSgndHJ1bmsn LCAnbWFpbicpCiAgICAgICAgICAgICBzZWxmLnNldFByb3BlcnR5KCdpZGVudGlmaWVyJywgaWRl bnRpZmllcikKICAgICAgICAgICAgIHN0ZXAgPSBzZWxmLmdldExhc3RCdWlsZFN0ZXBCeU5hbWUo Q2hlY2tPdXRTb3VyY2UubmFtZSkKICAgICAgICAgICAgIGlmIG5vdCBzdGVwOgpJbmRleDogVG9v bHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvQ0lTdXBwb3J0L2J1aWxkLXdlYmtpdC1vcmcvc3RlcHNfdW5pdHRlc3QucHkJ KHJldmlzaW9uIDI3Mjc4MikKKysrIFRvb2xzL0NJU3VwcG9ydC9idWlsZC13ZWJraXQtb3JnL3N0 ZXBzX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC01MTEsMTUgKzUxMSwxNSBAQCBjbGFz cyBUZXN0U2hvd0lkZW50aWZpZXIoQnVpbGRTdGVwTWl4aW5BCiAgICAgICAgIHNlbGYuc2V0UHJv cGVydHkoJ2dvdF9yZXZpc2lvbicsICcyNzI2OTInKQogICAgICAgICBzZWxmLmV4cGVjdFJlbW90 ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXInLAotICAg ICAgICAgICAgICAgICAgICAgICAgdGltZW91dD0xMjAsCisgICAgICAgICAgICAgICAgICAgICAg ICB0aW1lb3V0PTYwMCwKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249RmFsc2Us CiAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xzL1Njcmlw dHMvZ2l0LXdlYmtpdCcsICdmaW5kJywgJ3IyNzI2OTInXSkgKwotICAgICAgICAgICAgRXhwZWN0 U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nSWRlbnRpZmllcjogMjMzOTM5QHRydW5rJykgKwor ICAgICAgICAgICAgRXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nSWRlbnRpZmllcjog MjMzOTM5QG1haW4nKSArCiAgICAgICAgICAgICAwLAogICAgICAgICApCi0gICAgICAgIHNlbGYu ZXhwZWN0T3V0Y29tZShyZXN1bHQ9U1VDQ0VTUywgc3RhdGVfc3RyaW5nPSdJZGVudGlmaWVyOiAy MzM5MzlAdHJ1bmsnKQorICAgICAgICBzZWxmLmV4cGVjdE91dGNvbWUocmVzdWx0PVNVQ0NFU1Ms IHN0YXRlX3N0cmluZz0nSWRlbnRpZmllcjogMjMzOTM5QG1haW4nKQogICAgICAgICByYyA9IHNl bGYucnVuU3RlcCgpCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc2VsZi5nZXRQcm9wZXJ0eSgn aWRlbnRpZmllcicpLCAnMjMzOTM5QHRydW5rJykKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChz ZWxmLmdldFByb3BlcnR5KCdpZGVudGlmaWVyJyksICcyMzM5MzlAbWFpbicpCiAgICAgICAgIHJl dHVybiByYwogCiAgICAgZGVmIHRlc3RfZmFpbHVyZShzZWxmKToKQEAgLTUyNyw3ICs1MjcsNyBA QCBjbGFzcyBUZXN0U2hvd0lkZW50aWZpZXIoQnVpbGRTdGVwTWl4aW5BCiAgICAgICAgIHNlbGYu c2V0UHJvcGVydHkoJ2dvdF9yZXZpc2lvbicsICcyNzI2OTInKQogICAgICAgICBzZWxmLmV4cGVj dFJlbW90ZUNvbW1hbmRzKAogICAgICAgICAgICAgRXhwZWN0U2hlbGwod29ya2Rpcj0nd2tkaXIn LAotICAgICAgICAgICAgICAgICAgICAgICAgdGltZW91dD0xMjAsCisgICAgICAgICAgICAgICAg ICAgICAgICB0aW1lb3V0PTYwMCwKICAgICAgICAgICAgICAgICAgICAgICAgIGxvZ0Vudmlyb249 RmFsc2UsCiAgICAgICAgICAgICAgICAgICAgICAgICBjb21tYW5kPVsncHl0aG9uJywgJ1Rvb2xz L1NjcmlwdHMvZ2l0LXdlYmtpdCcsICdmaW5kJywgJ3IyNzI2OTInXSkgKwogICAgICAgICAgICAg RXhwZWN0U2hlbGwubG9nKCdzdGRpbycsIHN0ZG91dD0nVW5leHBlY3RlZCBmYWlsdXJlJykgKwo=