150665 2015-10-29 03:16:56 -0700 [JHBuild] Do not try to update the dependencies if jhbuild configuration hasn't changed 2015-10-30 01:49:01 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED Gtk P2 Normal --- 1 cgarcia webkit-unassigned commit-queue gyuyoung.kim lforschler mrobinson ossy zan oldest_to_newest 1137488 0 cgarcia 2015-10-29 03:16:56 -0700 We check it only to wipe the directory or not, but we are still tryihng to update every module even when the configuration hasn't changed. This is problematic because it makes the whole build fail when any repository fails to checkout an already checked out revision, because the server is down for example. This is even more problematic for the bots that skip perfectly valid revisions. 1137489 1 264308 cgarcia 2015-10-29 03:20:56 -0700 Created attachment 264308 Patch 1137491 2 ossy 2015-10-29 03:35:10 -0700 The idea is good to fix this issue. I have only one issue with this change. If I would like to build an optional module (llvm is optional now), update-webkitefl-libs llvm-for-X86_64 wouldn't do anything. It would be great to fix it somehow. 1137495 3 cgarcia 2015-10-29 04:15:01 -0700 Ah, you are right, I forgot about the optional modules. We could either generate a md5 file for the optional moduleset file too or even better add an option --force since optional modules are supposed to be always built manually, no? 1137515 4 ossy 2015-10-29 06:23:22 -0700 (In reply to comment #3) > Ah, you are right, I forgot about the optional modules. We could either > generate a md5 file for the optional moduleset file too or even better add > an option --force since optional modules are supposed to be always built > manually, no? I think --force option is more than enough. ;) 1137820 5 264383 cgarcia 2015-10-29 23:55:16 -0700 Created attachment 264383 Added --force option 1137825 6 264383 ossy 2015-10-30 00:23:46 -0700 Comment on attachment 264383 Added --force option LGTM, thanks. 1137836 7 264383 commit-queue 2015-10-30 01:48:57 -0700 Comment on attachment 264383 Added --force option Clearing flags on attachment: 264383 Committed r191784: <http://trac.webkit.org/changeset/191784> 1137837 8 commit-queue 2015-10-30 01:49:01 -0700 All reviewed patches have been landed. Closing bug. 264308 2015-10-29 03:20:56 -0700 2015-10-29 23:55:16 -0700 Patch jhbuild-no-update-deps.diff text/plain 2912 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiZjc4 NmMyLi4yOTFkNjI3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTUtMTAtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtKSEJ1aWxkXSBEbyBub3QgdHJ5IHRv IHVwZGF0ZSB0aGUgZGVwZW5kZW5jaWVzIGlmIGpoYnVpbGQgY29uZmlndXJhdGlvbiBoYXNuJ3Qg Y2hhbmdlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUwNjY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V2UgY2hlY2sgaXQgb25seSB0byB3aXBlIHRoZSBkaXJlY3Rvcnkgb3Igbm90LCBidXQgd2UgYXJl IHN0aWxsCisgICAgICAgIHRyeWlobmcgdG8gdXBkYXRlIGV2ZXJ5IG1vZHVsZSBldmVuIHdoZW4g dGhlIGNvbmZpZ3VyYXRpb24gaGFzbid0CisgICAgICAgIGNoYW5nZWQuIFRoaXMgaXMgcHJvYmxl bWF0aWMgYmVjYXVzZSBpdCBtYWtlcyB0aGUgd2hvbGUgYnVpbGQgZmFpbAorICAgICAgICB3aGVu IGFueSByZXBvc2l0b3J5IGZhaWxzIHRvIGNoZWNrb3V0IGFuIGFscmVhZHkgY2hlY2tlZCBvdXQK KyAgICAgICAgcmV2aXNpb24sIGJlY2F1c2UgdGhlIHNlcnZlciBpcyBkb3duIGZvciBleGFtcGxl LiBUaGlzIGlzIGV2ZW4KKyAgICAgICAgbW9yZSBwcm9ibGVtYXRpYyBmb3IgdGhlIGJvdHMgdGhh dCBza2lwIHBlcmZlY3RseSB2YWxpZCByZXZpc2lvbnMuCisKKyAgICAgICAgKiBTY3JpcHRzL3Vw ZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkOgorICAgICAgICAoZGVsZXRlSmhidWlsZE1kNSk6IERl bGV0ZSB0aGUgbWQ1c3VtIGZpbGVzIGlmIGV4aXN0LgorICAgICAgICAocnVuSmhidWlsZCk6IFJl dHVybiBlYXJseSBpZiB0aGUgbWQ1c3VtIGZpbGVzIGhhdmVuJ3QKKyAgICAgICAgY2hhbmdlZC4g T25seSB3cml0ZSB0aGVtIGFmdGVyIGEgc3VjY2Vzc2Z1bCBidWlsZCBhbmQgZGVsZXRlIHRoZW0K KyAgICAgICAgaWYgdGhlIGJ1aWxkIGZhaWxzIHRvIGVuc3VyZSB3ZSBkb24ndCBza2lwIG5leHQg cnVuLgorCiAyMDE1LTEwLTI4ICBLZWl0aCBSb2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAog ICAgICAgICBEbyBub3Qgc2FuaXRpemUgdXNlciBpbnB1dCBmb3IgaW5wdXRbdHlwZT11cmxdCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkIGIvVG9v bHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZAppbmRleCAzNjFiOGVhLi4zNzdh NTViIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxk CisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1saWJzLWpoYnVpbGQKQEAgLTg1LDEy ICs4NSwyMyBAQCBzdWIgc2F2ZUpoYnVpbGRNZDUoKSB7CiAgICAgfQogfQogCitzdWIgZGVsZXRl SmhidWlsZE1kNSgpIHsKKyAgICBteSAkamhidWlsZFBhdGggPSBnZXRKaGJ1aWxkUGF0aCgpOwor ICAgIGlmICghLWQgJGpoYnVpbGRQYXRoKSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAg Zm9yZWFjaCBteSAkZmlsZSAocXcoamhidWlsZHJjIGpoYnVpbGQubW9kdWxlcykpIHsKKyAgICAg ICAgbXkgJG1kNUZpbGUgPSBqb2luKCcvJywgJGpoYnVpbGRQYXRoLCAkZmlsZSkgLiAiLm1kNXN1 bSI7CisgICAgICAgIHVubGluaygkbWQ1RmlsZSkgaWYgLWUgJG1kNUZpbGU7CisgICAgfQorfQor CiBzdWIgcnVuSmhidWlsZAogewogICAgIG15ICRjb21tYW5kID0gc2hpZnQ7CiAgICAgbXkgQGpo YnVpbGRBcmdzID0gKCIuL2poYnVpbGQtd3JhcHBlciIsICItLSIuJHBsYXRmb3JtLCAkY29tbWFu ZCk7CiAgICAgcHVzaChAamhidWlsZEFyZ3MsIEBBUkdWWzAuLiQjQVJHVl0pOwotICAgIHN5c3Rl bShAamhidWlsZEFyZ3MpID09IDAgb3IgZGllICJSdW5uaW5nIGpoYnVpbGQtd3JhcHBlciAiIC4g JGNvbW1hbmQgLiAiIGZhaWxlZC5cbiI7CisgICAgcmV0dXJuIHN5c3RlbShAamhidWlsZEFyZ3Mp OwogfQogCiBzdWIgY2xlYW5KaGJ1aWxkKCkKQEAgLTExNCwxMSArMTI1LDE5IEBAIGNoZGlyKHJl bGF0aXZlU2NyaXB0c0RpcigpIC4gIi8uLi9qaGJ1aWxkIikgb3IgZGllICQhOwogCiBteSAlcHJl dHR5UGxhdGZvcm0gPSAoICJlZmwiID0+ICJFRkwiLCAiZ3RrIiA9PiAiR1RLKyIgKTsKIAotaWYg KCR3aXBlT25DaGFuZ2UgJiYgLWUgZ2V0SmhidWlsZFBhdGgoKSAmJiBqaGJ1aWxkQ29uZmlndXJh dGlvbkNoYW5nZWQoKSkgewotICAgIGNsZWFuSmhidWlsZCgpOworaWYgKCFqaGJ1aWxkQ29uZmln dXJhdGlvbkNoYW5nZWQoKSkgeworICAgIHByaW50ICRwcmV0dHlQbGF0Zm9ybXskcGxhdGZvcm19 IC4gIiBwb3J0IGRlcGVuZGVuY2llcyBhcmUgYWxyZWFkeSB1cCB0byBkYXRlXG4iOworICAgIGV4 aXQgMDsKIH0KIAotc2F2ZUpoYnVpbGRNZDUoKTsKK2lmICgkd2lwZU9uQ2hhbmdlICYmIC1lIGdl dEpoYnVpbGRQYXRoKCkpIHsKKyAgICBjbGVhbkpoYnVpbGQoKTsKK30KIAogcHJpbnQgIlVwZGF0 aW5nICIgLiAkcHJldHR5UGxhdGZvcm17JHBsYXRmb3JtfSAuICIgcG9ydCBkZXBlbmRlbmNpZXMg dXNpbmcgamhidWlsZC4uLlxuIjsKLXJ1bkpoYnVpbGQoImJ1aWxkIik7CitpZiAocnVuSmhidWls ZCgiYnVpbGQiKSA9PSAwKSB7CisgICAgc2F2ZUpoYnVpbGRNZDUoKTsKK30gZWxzZSB7CisgICAg ZGVsZXRlSmhidWlsZE1kNSgpOworICAgIGRpZSAiRmFpbGVkIHRvIGJ1aWxkICIgLiAkcHJldHR5 UGxhdGZvcm17JHBsYXRmb3JtfSAuICIgcG9ydCBkZXBlbmRlbmNpZXMgd2l0aCBqaGJ1aWxkXG4i OworfQo= 264383 2015-10-29 23:55:16 -0700 2015-10-30 01:48:57 -0700 Added --force option update-libs.diff text/plain 3568 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA5Mjk5 NmVlLi5hMGYwYzQ2IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTUtMTAtMjkgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtKSEJ1aWxkXSBEbyBub3QgdHJ5IHRv IHVwZGF0ZSB0aGUgZGVwZW5kZW5jaWVzIGlmIGpoYnVpbGQgY29uZmlndXJhdGlvbiBoYXNuJ3Qg Y2hhbmdlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTUwNjY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V2UgY2hlY2sgaXQgb25seSB0byB3aXBlIHRoZSBkaXJlY3Rvcnkgb3Igbm90LCBidXQgd2UgYXJl IHN0aWxsCisgICAgICAgIHRyeWlobmcgdG8gdXBkYXRlIGV2ZXJ5IG1vZHVsZSBldmVuIHdoZW4g dGhlIGNvbmZpZ3VyYXRpb24gaGFzbid0CisgICAgICAgIGNoYW5nZWQuIFRoaXMgaXMgcHJvYmxl bWF0aWMgYmVjYXVzZSBpdCBtYWtlcyB0aGUgd2hvbGUgYnVpbGQgZmFpbAorICAgICAgICB3aGVu IGFueSByZXBvc2l0b3J5IGZhaWxzIHRvIGNoZWNrb3V0IGFuIGFscmVhZHkgY2hlY2tlZCBvdXQK KyAgICAgICAgcmV2aXNpb24sIGJlY2F1c2UgdGhlIHNlcnZlciBpcyBkb3duIGZvciBleGFtcGxl LiBUaGlzIGlzIGV2ZW4KKyAgICAgICAgbW9yZSBwcm9ibGVtYXRpYyBmb3IgdGhlIGJvdHMgdGhh dCBza2lwIHBlcmZlY3RseSB2YWxpZCByZXZpc2lvbnMuCisgICAgICAgIEl0J3Mgc3RpbGwgcG9z c2libGUgdG8gZm9yY2UgYW4gdXBkYXRlIHBhc3NpbmcgLS1mb3JjZSBjb21tYW5kCisgICAgICAg IGxpbmUgYXJndW1lbnQuCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1q aGJ1aWxkOgorICAgICAgICAoZGVsZXRlSmhidWlsZE1kNSk6IERlbGV0ZSB0aGUgbWQ1c3VtIGZp bGVzIGlmIGV4aXN0LgorICAgICAgICAocnVuSmhidWlsZCk6IFJldHVybiBlYXJseSBpZiB0aGUg bWQ1c3VtIGZpbGVzIGhhdmVuJ3QKKyAgICAgICAgY2hhbmdlZC4gT25seSB3cml0ZSB0aGVtIGFm dGVyIGEgc3VjY2Vzc2Z1bCBidWlsZCBhbmQgZGVsZXRlIHRoZW0KKyAgICAgICAgaWYgdGhlIGJ1 aWxkIGZhaWxzIHRvIGVuc3VyZSB3ZSBkb24ndCBza2lwIG5leHQgcnVuLgorCiAyMDE1LTEwLTI5 ICBIdW5zZW9wIEplb25nICA8aHM4NS5qZW9uZ0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZM XSBNaW5pQnJvd3NlciBkaWRuJ3Qgd29yayBhZnRlciByMTkxNzQ5LgpkaWZmIC0tZ2l0IGEvVG9v bHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZCBiL1Rvb2xzL1NjcmlwdHMvdXBk YXRlLXdlYmtpdC1saWJzLWpoYnVpbGQKaW5kZXggMzYxYjhlYS4uN2I1OGJiNiAxMDA3NTUKLS0t IGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWxpYnMtamhidWlsZAorKysgYi9Ub29scy9T Y3JpcHRzL3VwZGF0ZS13ZWJraXQtbGlicy1qaGJ1aWxkCkBAIC0yNSwxMyArMjUsMTggQEAgdXNl IEdldG9wdDo6TG9uZyBxdyg6Y29uZmlnIHBhc3NfdGhyb3VnaCk7CiBteSAkcGxhdGZvcm0gPSAi IjsKICRwbGF0Zm9ybSA9ICJlZmwiIGlmIGlzRWZsKCk7CiAkcGxhdGZvcm0gPSAiZ3RrIiBpZiBp c0d0aygpOwotbXkgJHdpcGVPbkNoYW5nZSA9ICRFTlZ7SkhCVUlMRF9XSVBFX09OX0NIQU5HRX0g Ly8gMTsKIAogaWYgKCEkcGxhdGZvcm0pIHsKICAgICBkaWUgIk5vIHBsYXRmb3JtIHNwZWNpZmll ZCBmb3IgIiAuIGJhc2VuYW1lKCQwKSAuIi4gVXNlIC0tZ3RrIG9yIC0tZWZsLlxuIjsKIH0KIAot R2V0T3B0aW9ucygnd2lwZS1vbi1jaGFuZ2UhJyA9PiBcJHdpcGVPbkNoYW5nZSwpOworbXkgJHdp cGVPbkNoYW5nZSA9ICRFTlZ7SkhCVUlMRF9XSVBFX09OX0NIQU5HRX0gLy8gMTsKK215ICRmb3Jj ZSA9IDA7CisKK0dldE9wdGlvbnMoCisgICAgJ3dpcGUtb24tY2hhbmdlIScgPT4gXCR3aXBlT25D aGFuZ2UsCisgICAgJ2ZvcmNlJyA9PiBcJGZvcmNlCispOwogCiBzdWIgZ2V0TUQ1SGFzaEZvckZp bGUoJCkKIHsKQEAgLTg1LDEyICs5MCwyMyBAQCBzdWIgc2F2ZUpoYnVpbGRNZDUoKSB7CiAgICAg fQogfQogCitzdWIgZGVsZXRlSmhidWlsZE1kNSgpIHsKKyAgICBteSAkamhidWlsZFBhdGggPSBn ZXRKaGJ1aWxkUGF0aCgpOworICAgIGlmICghLWQgJGpoYnVpbGRQYXRoKSB7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgZm9yZWFjaCBteSAkZmlsZSAocXcoamhidWlsZHJjIGpoYnVpbGQu bW9kdWxlcykpIHsKKyAgICAgICAgbXkgJG1kNUZpbGUgPSBqb2luKCcvJywgJGpoYnVpbGRQYXRo LCAkZmlsZSkgLiAiLm1kNXN1bSI7CisgICAgICAgIHVubGluaygkbWQ1RmlsZSkgaWYgLWUgJG1k NUZpbGU7CisgICAgfQorfQorCiBzdWIgcnVuSmhidWlsZAogewogICAgIG15ICRjb21tYW5kID0g c2hpZnQ7CiAgICAgbXkgQGpoYnVpbGRBcmdzID0gKCIuL2poYnVpbGQtd3JhcHBlciIsICItLSIu JHBsYXRmb3JtLCAkY29tbWFuZCk7CiAgICAgcHVzaChAamhidWlsZEFyZ3MsIEBBUkdWWzAuLiQj QVJHVl0pOwotICAgIHN5c3RlbShAamhidWlsZEFyZ3MpID09IDAgb3IgZGllICJSdW5uaW5nIGpo YnVpbGQtd3JhcHBlciAiIC4gJGNvbW1hbmQgLiAiIGZhaWxlZC5cbiI7CisgICAgcmV0dXJuIHN5 c3RlbShAamhidWlsZEFyZ3MpOwogfQogCiBzdWIgY2xlYW5KaGJ1aWxkKCkKQEAgLTExNCwxMSAr MTMwLDE5IEBAIGNoZGlyKHJlbGF0aXZlU2NyaXB0c0RpcigpIC4gIi8uLi9qaGJ1aWxkIikgb3Ig ZGllICQhOwogCiBteSAlcHJldHR5UGxhdGZvcm0gPSAoICJlZmwiID0+ICJFRkwiLCAiZ3RrIiA9 PiAiR1RLKyIgKTsKIAotaWYgKCR3aXBlT25DaGFuZ2UgJiYgLWUgZ2V0SmhidWlsZFBhdGgoKSAm JiBqaGJ1aWxkQ29uZmlndXJhdGlvbkNoYW5nZWQoKSkgewotICAgIGNsZWFuSmhidWlsZCgpOwor aWYgKCEkZm9yY2UgJiYgIWpoYnVpbGRDb25maWd1cmF0aW9uQ2hhbmdlZCgpKSB7CisgICAgcHJp bnQgJHByZXR0eVBsYXRmb3JteyRwbGF0Zm9ybX0gLiAiIHBvcnQgZGVwZW5kZW5jaWVzIGFyZSBh bHJlYWR5IHVwIHRvIGRhdGVcbiI7CisgICAgZXhpdCAwOwogfQogCi1zYXZlSmhidWlsZE1kNSgp OworaWYgKCR3aXBlT25DaGFuZ2UgJiYgLWUgZ2V0SmhidWlsZFBhdGgoKSkgeworICAgIGNsZWFu SmhidWlsZCgpOworfQogCiBwcmludCAiVXBkYXRpbmcgIiAuICRwcmV0dHlQbGF0Zm9ybXskcGxh dGZvcm19IC4gIiBwb3J0IGRlcGVuZGVuY2llcyB1c2luZyBqaGJ1aWxkLi4uXG4iOwotcnVuSmhi dWlsZCgiYnVpbGQiKTsKK2lmIChydW5KaGJ1aWxkKCJidWlsZCIpID09IDApIHsKKyAgICBzYXZl SmhidWlsZE1kNSgpOworfSBlbHNlIHsKKyAgICBkZWxldGVKaGJ1aWxkTWQ1KCk7CisgICAgZGll ICJGYWlsZWQgdG8gYnVpbGQgIiAuICRwcmV0dHlQbGF0Zm9ybXskcGxhdGZvcm19IC4gIiBwb3J0 IGRlcGVuZGVuY2llcyB3aXRoIGpoYnVpbGRcbiI7Cit9Cg==