232403 2021-10-27 14:06:04 -0700 AutoInstall should have separate install directories per CPU architecture 2021-11-01 12:35:30 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=232573 InRadar P2 Normal --- 1 ap ap jbedard webkit-bug-importer oldest_to_newest 1809421 0 ap 2021-10-27 14:06:04 -0700 Would like to make it possible to run scripts on macOS under Rosetta without deleting the auto installed directory (binaries there aren't FAT). 1809422 1 442635 ap 2021-10-27 14:07:12 -0700 Created attachment 442635 proposed patch 1809426 2 442635 jbedard 2021-10-27 14:15:46 -0700 Comment on attachment 442635 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=442635&action=review > Tools/Scripts/webkitpy/__init__.py:35 > +AutoInstall.set_directory(os.path.join(libraries, 'autoinstalled', 'python-{}-{}'.format(sys.version_info[0], platform.machine()))) This looks good, the only issue is that we're going to force a re-install of everything because python-3 will now be python-3-arm64, but that seems like an acceptable cost. 1809427 3 442635 ap 2021-10-27 14:17:42 -0700 Comment on attachment 442635 proposed patch Looks like this broke the style bot somehow. 1809433 4 ap 2021-10-27 14:33:53 -0700 I'm told that this happened on this machine before, and a retry cured it (not just on EWS which re-ran on a different bot, but on webkit-misc itself). 1809434 5 ews-feeder 2021-10-27 14:34:03 -0700 Downloading setuptools-56.2.0... Installing setuptools-56.2.0... Installed setuptools-56.2.0! Downloading setuptools-scm-5.0.2... Installing setuptools-scm-5.0.2... Installed setuptools-scm-5.0.2! Downloading wheel-0.35.1... Installing wheel-0.35.1... Installed wheel-0.35.1! Downloading six-1.15.0... Installing six-1.15.0... Installed six-1.15.0! Downloading fasteners-0.15.0... Installing fasteners-0.15.0... Installed fasteners-0.15.0! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 66, in <module> from webkitscmpy import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/__init__.py", line 4, in <module> from webkitscmpy.local.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py", line 38, in <module> from webkitscmpy import remote, Commit, Contributor, Version File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/__init__.py", line 24, in <module> from webkitscmpy.remote.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py", line 25, in <module> import fasteners ModuleNotFoundError: No module named 'fasteners' 1809443 6 442635 ap 2021-10-27 14:58:57 -0700 Comment on attachment 442635 proposed patch Same thing here on webkit-cq-03 apparently, and I feel like it will happen in other places. Not new to this patch though, it just stress tests existing behavior. 1809444 7 ews-feeder 2021-10-27 15:00:01 -0700 Downloading monotonic-1.5.0... Installing monotonic-1.5.0... Installed monotonic-1.5.0! Downloading requests-2.24.0... Installing requests-2.24.0... Installed requests-2.24.0! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 66, in <module> from webkitscmpy import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/__init__.py", line 4, in <module> from webkitscmpy.local.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py", line 38, in <module> from webkitscmpy import remote, Commit, Contributor, Version File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/__init__.py", line 24, in <module> from webkitscmpy.remote.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py", line 29, in <module> import requests ModuleNotFoundError: No module named 'requests' 1809448 8 ews-feeder 2021-10-27 15:06:42 -0700 Downloading setuptools-56.2.0... Installing setuptools-56.2.0... Installed setuptools-56.2.0! Downloading setuptools-scm-5.0.2... Installing setuptools-scm-5.0.2... Installed setuptools-scm-5.0.2! Downloading wheel-0.35.1... Installing wheel-0.35.1... Installed wheel-0.35.1! Downloading six-1.15.0... Installing six-1.15.0... Installed six-1.15.0! Downloading fasteners-0.15.0... Installing fasteners-0.15.0... Installed fasteners-0.15.0! Downloading monotonic-1.5.0... Installing monotonic-1.5.0... Installed monotonic-1.5.0! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 66, in <module> from webkitscmpy import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/__init__.py", line 4, in <module> from webkitscmpy.local.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py", line 38, in <module> from webkitscmpy import remote, Commit, Contributor, Version File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/__init__.py", line 24, in <module> from webkitscmpy.remote.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py", line 25, in <module> import fasteners File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/fasteners/__init__.py", line 23, in <module> from fasteners.lock import locked # noqa File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/fasteners/lock.py", line 24, in <module> from fasteners import _utils File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/fasteners/_utils.py", line 39, in <module> from monotonic import monotonic as now # noqa ModuleNotFoundError: No module named 'monotonic' 1809457 9 ews-feeder 2021-10-27 15:28:33 -0700 Downloading requests-2.24.0... Installing requests-2.24.0... Installed requests-2.24.0! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 66, in <module> from webkitscmpy import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/__init__.py", line 4, in <module> from webkitscmpy.local.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py", line 38, in <module> from webkitscmpy import remote, Commit, Contributor, Version File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/__init__.py", line 24, in <module> from webkitscmpy.remote.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py", line 29, in <module> import requests ModuleNotFoundError: No module named 'requests' 1809458 10 ews-feeder 2021-10-27 15:31:21 -0700 Downloading urllib3-1.25.10... Installing urllib3-1.25.10... Installed urllib3-1.25.10! Downloading chardet-3.0.4... Installing chardet-3.0.4... Installed chardet-3.0.4! Downloading certifi-2020.6.20... Installing certifi-2020.6.20... Installed certifi-2020.6.20! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 66, in <module> from webkitscmpy import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/__init__.py", line 4, in <module> from webkitscmpy.local.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py", line 38, in <module> from webkitscmpy import remote, Commit, Contributor, Version File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/__init__.py", line 24, in <module> from webkitscmpy.remote.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py", line 29, in <module> import requests File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/requests/__init__.py", line 120, in <module> from . import utils File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/requests/utils.py", line 25, in <module> from . import certs File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/requests/certs.py", line 15, in <module> from certifi import where ModuleNotFoundError: No module named 'certifi' 1809475 11 ews-feeder 2021-10-27 16:10:08 -0700 Downloading idna-2.10.0... Installing idna-2.10.0... Installed idna-2.10.0! Downloading PySocks-1.7.1... Installing PySocks-1.7.1... Installed PySocks-1.7.1! Downloading xmltodict-0.11.0... Installing xmltodict-0.11.0... Installed xmltodict-0.11.0! Downloading mock-4.0.3... Installing mock-4.0.3... Installed mock-4.0.3! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 67, in <module> from webkitscmpy import mocks File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/__init__.py", line 3, in <module> from webkitscmpy.mocks import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/__init__.py", line 3, in <module> from webkitscmpy.mocks.local.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/svn.py", line 28, in <module> from mock import patch ModuleNotFoundError: No module named 'mock' 1809476 12 ews-feeder 2021-10-27 16:12:14 -0700 Downloading whichcraft-0.6.1... Installing whichcraft-0.6.1... Installed whichcraft-0.6.1! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 67, in <module> from webkitscmpy import mocks File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/__init__.py", line 3, in <module> from webkitscmpy.mocks import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/__init__.py", line 4, in <module> from webkitscmpy.mocks.local.git import Git File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/mocks/local/git.py", line 34, in <module> from webkitscmpy.program.canonicalize.committer import main as committer_main File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/__init__.py", line 28, in <module> from .blame import Blame File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/blame.py", line 28, in <module> from webkitscmpy.program.command import FilteredCommand File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/command.py", line 32, in <module> from whichcraft import which ModuleNotFoundError: No module named 'whichcraft' 1809479 13 ews-feeder 2021-10-27 16:17:52 -0700 Downloading urllib3-1.25.10... Installing urllib3-1.25.10... Installed urllib3-1.25.10! Downloading chardet-3.0.4... Installing chardet-3.0.4... Installed chardet-3.0.4! Downloading certifi-2020.6.20... Installing certifi-2020.6.20... Installed certifi-2020.6.20! Traceback (most recent call last): File "Tools/Scripts/webkit-patch", line 41, in <module> from webkitpy.common.system.logutils import configure_logging File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/webkitpy/__init__.py", line 85, in <module> import webkitscmpy File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/__init__.py", line 66, in <module> from webkitscmpy import local File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/__init__.py", line 4, in <module> from webkitscmpy.local.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/svn.py", line 38, in <module> from webkitscmpy import remote, Commit, Contributor, Version File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/__init__.py", line 24, in <module> from webkitscmpy.remote.svn import Svn File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/webkitscmpy/webkitscmpy/remote/svn.py", line 29, in <module> import requests File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/requests/__init__.py", line 120, in <module> from . import utils File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/requests/utils.py", line 25, in <module> from . import certs File "/Volumes/Data/worker/Commit-Queue/build/Tools/Scripts/libraries/autoinstalled/python-3-x86_64/requests/certs.py", line 15, in <module> from certifi import where ModuleNotFoundError: No module named 'certifi' 1809485 14 ews-feeder 2021-10-27 16:27:38 -0700 Committed r284964 (243615@main): <https://commits.webkit.org/243615@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 442635. 1809486 15 webkit-bug-importer 2021-10-27 16:28:16 -0700 <rdar://problem/84733102> 442635 2021-10-27 14:07:12 -0700 2021-10-27 16:27:39 -0700 proposed patch AutoinstallCPU.txt text/plain 1468 ap SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4NDkzOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDIxLTEwLTI3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgorCisgICAgICAgIEF1dG9JbnN0YWxsIHNob3VsZCBoYXZlIHNlcGFyYXRlIGluc3RhbGwgZGly ZWN0b3JpZXMgcGVyIENQVSBhcmNoaXRlY3R1cmUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMjQwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9fX2luaXRfXy5weToKKwog MjAyMS0xMC0yNyAgS2F0ZSBDaGVuZXkgIDxrYXRoZXJpbmVfY2hlbmV5QGFwcGxlLmNvbT4KIAog ICAgICAgICBSRUdSRVNTSU9OOiBbaU9TXSBUZXN0V2ViS2l0QVBJLkluQXBwQnJvd3NlclByaXZh Y3kuQXBwQm91bmREb21haW5BbGxvd3NTZXJ2aWNlV29ya2VycyBpcyBmYWlsaW5nCkluZGV4OiBU b29scy9TY3JpcHRzL3dlYmtpdHB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI4NDkyMykKKysrIFRvb2xzL1Nj cmlwdHMvd2Via2l0cHkvX19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTEzLDYgKzEzLDcg QEAKICMgYXMgbmVjZXNzYXJ5LgogCiBpbXBvcnQgb3MKK2ltcG9ydCBwbGF0Zm9ybQogaW1wb3J0 IHN5cwogCiAjIFdlIGFsd2F5cyB3YW50IHRoZSByZWFsIHN5c3RlbSB2ZXJzaW9uCkBAIC0zMSw3 ICszMiw3IEBAIGlmIHN5cy5wbGF0Zm9ybSA9PSAnZGFyd2luJzoKICAgICAgICAgbGlicmFyaWVz ID0gb3MucGF0aC5leHBhbmR1c2VyKCd+L0xpYnJhcnkvd2Via2l0cHknKQogCiBmcm9tIHdlYmtp dGNvcmVweSBpbXBvcnQgQXV0b0luc3RhbGwsIFBhY2thZ2UsIFZlcnNpb24KLUF1dG9JbnN0YWxs LnNldF9kaXJlY3Rvcnkob3MucGF0aC5qb2luKGxpYnJhcmllcywgJ2F1dG9pbnN0YWxsZWQnLCAn cHl0aG9uLXt9Jy5mb3JtYXQoc3lzLnZlcnNpb25faW5mb1swXSkpKQorQXV0b0luc3RhbGwuc2V0 X2RpcmVjdG9yeShvcy5wYXRoLmpvaW4obGlicmFyaWVzLCAnYXV0b2luc3RhbGxlZCcsICdweXRo b24te30te30nLmZvcm1hdChzeXMudmVyc2lvbl9pbmZvWzBdLCBwbGF0Zm9ybS5tYWNoaW5lKCkp KSkKIAogaWYgc3lzLnZlcnNpb25faW5mbyA+PSAoMywgNSk6CiAgICAgQXV0b0luc3RhbGwucmVn aXN0ZXIoUGFja2FnZSgncHlsaW50JywgVmVyc2lvbigyLCA2LCAwKSkpCg==