192702 2018-12-14 09:14:32 -0800 [Flatpak] Second run update-webkitwpe-flatpak fails 2019-04-08 05:15:27 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 191196 1 aperez pnormand cgarcia commit-queue lforschler mcatanzaro pnormand tsaunier webkit-bug-importer oldest_to_newest 1487930 0 aperez 2018-12-14 09:14:32 -0800 Steps to reproduce: 1. git clean -xdff 2. ./Tools/Scripts/update-webkitwpe-flatpak 3. ./Tools/Scripts/update-webkitwpe-flatpak The first invocation of “update-webkitwpe-flatpak” builds and install everything correctly. Subsequent invocations always fail (command output below). The same goes for “update-webkitgtk-flatpak”. ----- % update-webkitwpe-flatpak Updating Flatpak environment for WPE (Release) Looking for updates... Updating in user: org.gnome.Platform/x86_64/3.28 flathub 9d3fe926d425 Updating for user: org.gnome.Platform/x86_64/3.28 from flathub Error: Failed to update org.gnome.Platform/x86_64/3.28: Commit 9d3fe926d425ad837e40a0945020a00f09c1f531335987a753e07f276d76ee36: GPG verification enabled, but no signatures found (use gpg-verify=false in remote config to disable) error: There were one or more errors Traceback (most recent call last): File "/home/aperez/WebKit/Tools/Scripts/update-webkitwpe-flatpak", line 28, in <module> WebkitFlatpak.load_from_args(["--wpe", "--update"] + sys.argv[1:]).run() File "/home/aperez/WebKit/Tools/flatpak/flatpakutils.py", line 774, in run self.update_all() File "/home/aperez/WebKit/Tools/flatpak/flatpakutils.py", line 888, in update_all m.update() File "/home/aperez/WebKit/Tools/flatpak/flatpakutils.py", line 441, in update *extra_args, comment=comment) File "/home/aperez/WebKit/Tools/flatpak/flatpakutils.py", line 245, in flatpak return subprocess.check_call(command) File "/usr/lib64/python2.7/subprocess.py", line 190, in check_call raise CalledProcessError(retcode, cmd) subprocess.CalledProcessError: Command '['flatpak', 'update', '--user', 'org.gnome.Platform', '3.28', '--commit', '9d3fe926d425ad837e40a0945020a00f09c1f531335987a753e07f276d76ee36', '--assumeyes']' returned non-zero exit status 1 1520611 1 pnormand 2019-03-23 07:31:18 -0700 The error is different now, the issue is that we try to update the runtime and sdk to a commit that no longer exists in the flathub repo. 1520613 2 pnormand 2019-03-23 07:38:28 -0700 Another issue, the install/update logic is flawed, the sdk/runtime are installed, the latest version published on flathub are installed, but i think we should instead install the versions specified by hashes from the manifest. Currently the hashes are used only for the update workflow, which is prone to errors because the flathub admins seem to periodically remove old commits from their OStrees. 1520614 3 pnormand 2019-03-23 07:44:21 -0700 Today's hashes: diff --git a/Tools/flatpak/org.webkit.WebKit.yaml b/Tools/flatpak/org.webkit.WebKit.yaml index fe5b008f4be..167e43bc670 100644 --- a/Tools/flatpak/org.webkit.WebKit.yaml +++ b/Tools/flatpak/org.webkit.WebKit.yaml @@ -2,8 +2,8 @@ app-id: %(PORTNAME)s runtime: org.gnome.Platform runtime-version: "3.28" # Control the exact version of the Sdk/Runtime that is being used. -sdk-hash: ba3017972f1cc6c7c8b0ed7f80d3297ad4c6f4076bd799d0bab0e2cbaa3e3c0a -runtime-hash: 9d3fe926d425ad837e40a0945020a00f09c1f531335987a753e07f276d76ee36 +sdk-hash: 31af0c10f8e42151220a728b52df0a5c37ea8e4b033825f40c30e44d11cb31d1 +runtime-hash: 6d1d0ebbd72404c61d109307eb2240542b7ad82608bc6428bba6f3eebcfc8bf3 sdk: org.gnome.Sdk command: %(COMMAND)s finish-args: 1520615 4 pnormand 2019-03-23 07:46:59 -0700 I would remove the hashes, to be honest. Unless we can have guarantees the server admins that old commits are kept. Any thoughts? 1520702 5 mcatanzaro 2019-03-24 07:52:42 -0700 (In reply to Philippe Normand from comment #2) > Another issue, the install/update logic is flawed, the sdk/runtime are > installed, the latest version published on flathub are installed, but i > think we should instead install the versions specified by hashes from the > manifest. Currently the hashes are used only for the update workflow Ow, that's bad. :/ (In reply to Philippe Normand from comment #4) > I would remove the hashes, to be honest. Unless we can have guarantees the > server admins that old commits are kept. > > Any thoughts? We do have such guarantees. Alex has promised to keep old commits for some period of time (at least two months; I think I even heard six months? I don't remember the exact time guarantee). But if we leave old hashes there indefinitely, like we've been doing, then yes they will eventually break. Like anything, they have to be maintained. If you remove the hashes, then we'll all have different development environments and won't be able to have reproducible tests, so we'll never be able to get rid of the jhbuild. 1520707 6 pnormand 2019-03-24 08:33:45 -0700 (In reply to Michael Catanzaro from comment #5) > If you remove the hashes, then we'll all have different development > environments and won't be able to have reproducible tests, so we'll never be > able to get rid of the jhbuild. The install/update logic needs to be reversed then, as explained in comment 2 1525152 7 366924 pnormand 2019-04-08 02:55:23 -0700 Created attachment 366924 Patch 1525160 8 366924 commit-queue 2019-04-08 05:14:49 -0700 Comment on attachment 366924 Patch Clearing flags on attachment: 366924 Committed r243999: <https://trac.webkit.org/changeset/243999> 1525161 9 commit-queue 2019-04-08 05:14:50 -0700 All reviewed patches have been landed. Closing bug. 1525162 10 webkit-bug-importer 2019-04-08 05:15:27 -0700 <rdar://problem/49693050> 366924 2019-04-08 02:55:23 -0700 2019-04-08 05:14:49 -0700 Patch bug-192702-20190408115522.patch text/plain 3002 pnormand U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzOTcxCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDYxY2JjZGFjNjg5ZGQxMDdiYTg1MzkwMTZmNjI2NTEw MzAyOWI0ZS4uNTVkOTc2N2IwZDExODI4NDU4YTFhNjJjYTE2MjUyZDY5MTk2Y2VhOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE5LTA0LTA4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4K KworICAgICAgICBbRmxhdHBha10gU2Vjb25kIHJ1biB1cGRhdGUtd2Via2l0d3BlLWZsYXRwYWsg ZmFpbHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5 MjcwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog ZmxhdHBhay9mbGF0cGFrdXRpbHMucHk6CisgICAgICAgIChGbGF0cGFrT2JqZWN0LmZsYXRwYWsp OiBGaXggdHlwby4KKyAgICAgICAgKEZsYXRwYWtQYWNrYWdlLmluc3RhbGwpOiBXaGVuIGluc3Rh bGxpbmcsIGFsc28gdXBkYXRlIHRvIHRoZSBjb25maWd1cmVkIHJlbW90ZSBjb21taXQuCisgICAg ICAgICogZmxhdHBhay9vcmcud2Via2l0LldlYktpdC55YW1sOiBVcGRhdGUgR05PTUUgMy4yOCBT REsvcnVudGltZSBoYXNoZXMuCisKIDIwMTktMDQtMDUgIFNlcmdpbyBWaWxsYXIgU2VuaW4gIDxz dmlsbGFyQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS11bV1BFXSBvdXRsb29rLmxpdmUuY29t IGRpc3BsYXlzIG9sZC1mYXNoaW9uZWQgVUkKZGlmZiAtLWdpdCBhL1Rvb2xzL2ZsYXRwYWsvZmxh dHBha3V0aWxzLnB5IGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKaW5kZXggMDRkN2M4 ZGNhNGRhNWE1ZWFhNDM3ZWJmMDYyZDQxNmY0MDFiYzM3Ni4uMmUxYmY5ODRjYzUyNmM5NGFkZWU1 N2E5ODBiZjRhZDBlMjk1ODJmNyAxMDA2NDQKLS0tIGEvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRp bHMucHkKKysrIGIvVG9vbHMvZmxhdHBhay9mbGF0cGFrdXRpbHMucHkKQEAgLTI1Niw3ICsyNTYs NyBAQCBjbGFzcyBGbGF0cGFrT2JqZWN0OgogCiAgICAgZGVmIGZsYXRwYWsoc2VsZiwgY29tbWFu ZCwgKmFyZ3MsICoqa3dhcmdzKToKICAgICAgICAgc2hvd19vdXRwdXQgPSBrd2FyZ3MucG9wKCJz aG93X291dHB1dCIsIEZhbHNlKQotICAgICAgICBjb21tZW50ID0ga3dhcmdzLnBvcCgiY29tbWVu ZCIsIE5vbmUpCisgICAgICAgIGNvbW1lbnQgPSBrd2FyZ3MucG9wKCJjb21tZW50IiwgTm9uZSkK ICAgICAgICAgaWYgY29tbWVudDoKICAgICAgICAgICAgIENvbnNvbGUubWVzc2FnZShjb21tZW50 KQogCkBAIC00NzEsMTAgKzQ3MSwxMiBAQCBjbGFzcyBGbGF0cGFrUGFja2FnZShGbGF0cGFrT2Jq ZWN0KToKICAgICAgICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgICAgIGFyZ3MgPSBbImluc3Rh bGwiLCBzZWxmLnJlcG8ubmFtZSwgc2VsZi5uYW1lLCAiLS1yZWluc3RhbGwiLCBzZWxmLmJyYW5j aCwgIi0tYXNzdW1leWVzIl0KLQotICAgICAgICBzZWxmLmZsYXRwYWsoKmFyZ3MsIHNob3dfb3V0 cHV0PVRydWUsCi0gICAgICAgICAgICAgICAgICAgICBjb21tZW50PSJJbnN0YWxsaW5nIGZyb20g IiArIHNlbGYucmVwby5uYW1lICsgIiAiICsKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg c2VsZi5uYW1lICsgIiAiICsgc2VsZi5hcmNoICsgIiAiICsgc2VsZi5icmFuY2gpCisgICAgICAg IGNvbW1lbnQgPSAiSW5zdGFsbGluZyBmcm9tICIgKyBzZWxmLnJlcG8ubmFtZSArICIgIiArIHNl bGYubmFtZSArICIgIiArIHNlbGYuYXJjaCArICIgIiArIHNlbGYuYnJhbmNoCisgICAgICAgIHNl bGYuZmxhdHBhaygqYXJncywgc2hvd19vdXRwdXQ9VHJ1ZSwgY29tbWVudD1jb21tZW50KQorICAg ICAgICBpZiBzZWxmLmhhc2g6CisgICAgICAgICAgICBhcmdzID0gWyJ1cGRhdGUiLCAiLS1jb21t aXQiLCBzZWxmLmhhc2hdCisgICAgICAgICAgICBjb21tZW50ID0gIlVwZGF0aW5nIHRvICVzIiAl IHNlbGYuaGFzaAorICAgICAgICAgICAgc2VsZi5mbGF0cGFrKCphcmdzLCBzaG93X291dHB1dD1U cnVlLCBjb21tZW50PWNvbW1lbnQpCiAKICAgICBkZWYgdXBkYXRlKHNlbGYpOgogICAgICAgICBp ZiBub3Qgc2VsZi5pc19pbnN0YWxsZWQoc2VsZi5icmFuY2gpOgpkaWZmIC0tZ2l0IGEvVG9vbHMv ZmxhdHBhay9vcmcud2Via2l0LldlYktpdC55YW1sIGIvVG9vbHMvZmxhdHBhay9vcmcud2Via2l0 LldlYktpdC55YW1sCmluZGV4IGZlNWIwMDhmNGJlOGE1ZTMzZjhiZmFmN2YyMTc3YzdjZTIyYzI0 ZWUuLjE2N2U0M2JjNjcwMmE4YmYyMjRiYWRkMGRmY2U1ZjgxMGZhOTc0NzAgMTAwNjQ0Ci0tLSBh L1Rvb2xzL2ZsYXRwYWsvb3JnLndlYmtpdC5XZWJLaXQueWFtbAorKysgYi9Ub29scy9mbGF0cGFr L29yZy53ZWJraXQuV2ViS2l0LnlhbWwKQEAgLTIsOCArMiw4IEBAIGFwcC1pZDogJShQT1JUTkFN RSlzCiBydW50aW1lOiBvcmcuZ25vbWUuUGxhdGZvcm0KIHJ1bnRpbWUtdmVyc2lvbjogIjMuMjgi CiAjIENvbnRyb2wgdGhlIGV4YWN0IHZlcnNpb24gb2YgdGhlIFNkay9SdW50aW1lIHRoYXQgaXMg YmVpbmcgdXNlZC4KLXNkay1oYXNoOiBiYTMwMTc5NzJmMWNjNmM3YzhiMGVkN2Y4MGQzMjk3YWQ0 YzZmNDA3NmJkNzk5ZDBiYWIwZTJjYmFhM2UzYzBhCi1ydW50aW1lLWhhc2g6IDlkM2ZlOTI2ZDQy NWFkODM3ZTQwYTA5NDUwMjBhMDBmMDljMWY1MzEzMzU5ODdhNzUzZTA3ZjI3NmQ3NmVlMzYKK3Nk ay1oYXNoOiAzMWFmMGMxMGY4ZTQyMTUxMjIwYTcyOGI1MmRmMGE1YzM3ZWE4ZTRiMDMzODI1ZjQw YzMwZTQ0ZDExY2IzMWQxCitydW50aW1lLWhhc2g6IDZkMWQwZWJiZDcyNDA0YzYxZDEwOTMwN2Vi MjI0MDU0MmI3YWQ4MjYwOGJjNjQyOGJiYTZmM2VlYmNmYzhiZjMKIHNkazogb3JnLmdub21lLlNk awogY29tbWFuZDogJShDT01NQU5EKXMKIGZpbmlzaC1hcmdzOgo=