221711 2021-02-10 12:42:06 -0800 [Flatpak SDK] Support multiple builds running at the same time 2021-02-11 10:54:19 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=220781 https://bugs.webkit.org/show_bug.cgi?id=221070 https://bugs.webkit.org/show_bug.cgi?id=221757 InRadar P2 Normal --- 1 lmoura lmoura aboya bugs-noreply pnormand webkit-bug-importer oldest_to_newest 1727718 0 lmoura 2021-02-10 12:42:06 -0800 As part of Flatpak 1.10 changes regarding environment variables, the Flatpak SDK currently creates a `WebKitBuild/flatpak-env.json` variable to pass the needed environment variables to the webkit-bwrap wrapper. One such variable is WEBKIT_BUILD_DIR_BIND_MOUNT, which is used to bindmount the WebKitBuild/<PORT>/<CONFIG> directory into WebKitBuild/<CONFIG> inside the sanbox. While this has been working quite well when running *single* commands, this approach has some limitations. For example, running in parallel GTK and WPE MiniBrowsers. Each command would generate a different flatpak-env.json with its own config. Related revisions and bugs: * Initial flatpak-env.json patch: r271938 / bug220781 * Followup fix avoiding early deletion: r272018 / bug221070 1727939 1 419943 lmoura 2021-02-10 20:44:48 -0800 Created attachment 419943 Patch 1728004 2 ews-feeder 2021-02-11 01:29:29 -0800 Committed r272712: <https://commits.webkit.org/r272712> All reviewed patches have been landed. Closing bug and clearing flags on attachment 419943. 1728006 3 webkit-bug-importer 2021-02-11 01:30:19 -0800 <rdar://problem/74225666> 419943 2021-02-10 20:44:48 -0800 2021-02-11 01:29:30 -0800 Patch bug-221711-20210211014447.patch text/plain 3592 lmoura U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyNjg2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMTY0OTc0ZjE0MTFhNWZjNjg1ZjE0YzIxN2QzODc3MmU0 ZGY2MDY5OC4uOWViYjJjOTBkMWI1YTUyOGYxMDYxZTU2NjlkYmM2NTg5YjJmYTE1NCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5 IEBACisyMDIxLTAyLTEwICBMYXVybyBNb3VyYSAgPGxtb3VyYUBpZ2FsaWEuY29tPgorCisgICAg ICAgIFtGbGF0cGFrIFNES10gU3VwcG9ydCBtdWx0aXBsZSBidWlsZHMgcnVubmluZyBhdCB0aGUg c2FtZSB0aW1lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjE3MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBJbnN0ZWFkIG9mIHdyaXRpbmcgdGhlIGVudmlyb25tZW50IHRvIGEgZmlsZSwgcmVhZCB0aGUg LS1zZXRlbnYKKyAgICAgICAgYXJndW1lbnRzIGZyb20gdGhlIC0tYXJncyBmaWxlIGRlc2NyaXB0 b3IgcGFzc2VkIHRvIHdlYmtpdC1id3JhcCBsaWtlCisgICAgICAgIGJ3cmFwIGl0c2VsZiB3b3Vs ZCBkby4KKworICAgICAgICAqIGZsYXRwYWsvZmxhdHBha3V0aWxzLnB5OiBEbyBub3Qgd3JpdGUg dGhlIGVudiBmaWxlIGFueW1vcmUKKyAgICAgICAgKFdlYmtpdEZsYXRwYWsucnVuX2luX3NhbmRi b3gpOgorICAgICAgICAqIGZsYXRwYWsvd2Via2l0LWJ3cmFwOiBSZWFkIHRoZSBlbnZpcm9ubWVu dCBmcm9tIHRoZSBhcmdzIGZpbGUKKyAgICAgICAgZGVzY3JpcHRvci4KKwogMjAyMS0wMi0xMCAg UnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2Vk LCByZXZlcnRpbmcgcjI3MjUwNy4KZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxhdHBha3V0 aWxzLnB5IGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKaW5kZXggYjQwNjFhNWQxODg2 NWJmNzZlNDI5ZTdlZmRhMzNiM2EzMWYzMjZmZS4uY2JhZGViNzg3MDQwZTQxYzBlZTBjNWVhMGZm YjVkYTQwMmM0NGY3MyAxMDA2NDQKLS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkK KysrIGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKQEAgLTg4MiwyMCArODgyLDEwIEBA IGNsYXNzIFdlYmtpdEZsYXRwYWs6CiAgICAgICAgICAgICBwa2dfY29uZmlnX3BhdGggPSBzZWxm LmJ1aWxkX3BhdGgKICAgICAgICAgZmxhdHBha19lbnZbIlBLR19DT05GSUdfUEFUSCJdID0gcGtn X2NvbmZpZ19wYXRoCiAKLSAgICAgICAgZW52X2ZpbGUgPSBvcy5wYXRoLmpvaW4oc2VsZi5idWls ZF9yb290LCAnZmxhdHBhay1lbnYuanNvbicpCi0gICAgICAgIGlmIG5vdCBvcy5wYXRoLmV4aXN0 cyhlbnZfZmlsZSk6Ci0gICAgICAgICAgICB3aXRoIG9wZW4oZW52X2ZpbGUsICd3JykgYXMgZjoK LSAgICAgICAgICAgICAgICBqc29uLmR1bXAoZGljdChmbGF0cGFrX2VudiksIGYsIGluZGVudD0y KQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgZW52X2ZpbGUgPSBOb25lCi0KICAgICAgICAg dHJ5OgogICAgICAgICAgICAgcmV0dXJuIHNlbGYuZXhlY3V0ZV9jb21tYW5kKGZsYXRwYWtfY29t bWFuZCwgc3Rkb3V0PXN0ZG91dCwgZW52PWZsYXRwYWtfZW52KQogICAgICAgICBleGNlcHQgS2V5 Ym9hcmRJbnRlcnJ1cHQ6CiAgICAgICAgICAgICByZXR1cm4gMAotICAgICAgICBmaW5hbGx5Ogot ICAgICAgICAgICAgaWYgZW52X2ZpbGUgaXMgbm90IE5vbmUgYW5kIG9zLnBhdGguZXhpc3RzKGVu dl9maWxlKToKLSAgICAgICAgICAgICAgICBvcy5yZW1vdmUoZW52X2ZpbGUpCiAKICAgICAgICAg cmV0dXJuIDAKIApkaWZmIC0tZ2l0IGEvVG9vbHMvZmxhdHBhay93ZWJraXQtYndyYXAgYi9Ub29s cy9mbGF0cGFrL3dlYmtpdC1id3JhcAppbmRleCAyZWM3NDFjMTIwMGJkMmU3MjNkNmU4ZGZiZjhl NTNmYWNhZGI4YTJiLi44YzhjYTViYWE1N2YzMjk5OGI1MDNkYzM0YTVhODNlOTBkOTVkZDM2IDEw MDc1NQotLS0gYS9Ub29scy9mbGF0cGFrL3dlYmtpdC1id3JhcAorKysgYi9Ub29scy9mbGF0cGFr L3dlYmtpdC1id3JhcApAQCAtMjAsMTIgKzIwLDMwIEBACiBpbXBvcnQgb3MKIGltcG9ydCBpdGVy dG9vbHMKIGltcG9ydCBzaGxleAoraW1wb3J0IHN0YXQKIGltcG9ydCBzeXMKIGltcG9ydCB0ZW1w ZmlsZQogaW1wb3J0IGpzb24KIAogc2NyaXB0ZGlyID0gb3MucGF0aC5hYnNwYXRoKG9zLnBhdGgu ZGlybmFtZShfX2ZpbGVfXykpCiAKK2RlZiByZWFkX2xpbmVzKGZkOiBpbnQpOgorICAgIG5ld19m ZCA9IG9zLmR1cChmZCkKKyAgICBwb3MgPSBvcy5sc2VlayhmZCwgMCwgb3MuU0VFS19DVVIpCisg ICAgdHJ5OgorICAgICAgICB3aXRoIG9zLmZkb3BlbihuZXdfZmQsICdyJykgYXMgaGFuZGxlOgor ICAgICAgICAgICAgZGF0YSA9IGhhbmRsZS5yZWFkKCkKKyAgICAgICAgICAgIGxpbmVzID0gZGF0 YS5zcGxpdCgnXHgwMCcpCisgICAgICAgICAgICBmb3IgbGluZSBpbiBsaW5lczoKKyAgICAgICAg ICAgICAgICB5aWVsZCBsaW5lCisgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgorICAgICAgICBw cmludCgiRXJyb3IgcmVhZGluZyBicndhcCBhcmd1bWVudHMiLCBmaWxlPXN5cy5zdGRlcnIpCisg ICAgICAgIHByaW50KGUsIGZpbGU9c3lzLnN0ZGVycikKKyAgICBmaW5hbGx5OgorICAgICAgICBv cy5sc2VlayhmZCwgcG9zLCBvcy5TRUVLX1NFVCkKKworCisKIGRlZiBtYWluKGFyZ3M6IGxpc3Qp IC0+IGludDoKICAgICB0bXBkaXIgPSB0ZW1wZmlsZS5nZXR0ZW1wZGlyKCkKICAgICBzb3VyY2Vf cm9vdCA9IG9zLnBhdGgubm9ybXBhdGgob3MucGF0aC5hYnNwYXRoKG9zLnBhdGguam9pbihzY3Jp cHRkaXIsICcuLi8uLi8nKSkpCkBAIC0zNyw5ICs1NSwyMSBAQCBkZWYgbWFpbihhcmdzOiBsaXN0 KSAtPiBpbnQ6CiAgICAgICAgICIvcnVuL3NobSI6ICIvZGV2L3NobSIsCiAgICAgfQogCisgICAg YXJnc19pZHggPSBhcmdzLmluZGV4KCctLWFyZ3MnKQorICAgIGFyZ19mZCA9IGludChhcmdzW2Fy Z3NfaWR4ICsgMV0pCisKKyAgICBsaW5lcyA9IHJlYWRfbGluZXMoYXJnX2ZkKQorCiAgICAgZW52 aXJvbiA9IHt9Ci0gICAgd2l0aCBvcGVuKG9zLnBhdGguam9pbihidWlsZF9yb290LCAnZmxhdHBh ay1lbnYuanNvbicpKSBhcyBmOgotICAgICAgICBlbnZpcm9uID0ganNvbi5sb2FkKGYpCisgICAg d2hpbGUgVHJ1ZToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgYXJnID0gbmV4dChsaW5lcykK KyAgICAgICAgICAgIGlmIGFyZyA9PSAnLS1zZXRlbnYnOgorICAgICAgICAgICAgICAgIGtleSA9 IG5leHQobGluZXMpCisgICAgICAgICAgICAgICAgdmFsdWUgPSBuZXh0KGxpbmVzKQorICAgICAg ICAgICAgICAgIGVudmlyb25ba2V5XSA9IHZhbHVlCisgICAgICAgIGV4Y2VwdCBTdG9wSXRlcmF0 aW9uOgorICAgICAgICAgICAgYnJlYWsKIAogICAgIGZsYXRwYWtfdXNlcl9kaXIgPSBlbnZpcm9u LmdldCgiV0VCS0lUX0ZMQVRQQUtfVVNFUl9ESVIiKQogICAgIGlmIGZsYXRwYWtfdXNlcl9kaXI6 Cg==