зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1678641 - add support to mozinfo for apple_silicon. r=releng-reviewers,aki
Differential Revision: https://phabricator.services.mozilla.com/D97767
This commit is contained in:
Родитель
656ebe2d27
Коммит
43d0329455
|
@ -369,7 +369,10 @@ def mozharness_test_on_generic_worker(config, job, taskdesc):
|
|||
elif is_bitbar:
|
||||
py_binary = "python3" if py_3 else "python"
|
||||
mh_command = ["bash", "./{}".format(bitbar_script)]
|
||||
elif is_macosx and "macosx1014-64" in test["test-platform"]:
|
||||
elif is_macosx and (
|
||||
"macosx1014-64" in test["test-platform"]
|
||||
or "macosx1100-64" in test["test-platform"]
|
||||
):
|
||||
py_binary = "/usr/local/bin/{}".format("python3" if py_3 else "python2")
|
||||
mh_command = [
|
||||
py_binary,
|
||||
|
|
|
@ -149,9 +149,19 @@ elif sys.platform in ("solaris", "sunos5"):
|
|||
else:
|
||||
os_version = version = unknown
|
||||
|
||||
info["apple_silicon"] = False
|
||||
if (
|
||||
info["os"] == "mac"
|
||||
and float(os_version) > 10.15
|
||||
and processor == "i386"
|
||||
and bits == "64bit"
|
||||
):
|
||||
info["apple_silicon"] = True
|
||||
|
||||
info["version"] = version
|
||||
info["os_version"] = StringVersion(os_version)
|
||||
|
||||
|
||||
# processor type and bits
|
||||
if processor in ["i386", "i686"]:
|
||||
if bits == "32bit":
|
||||
|
|
Загрузка…
Ссылка в новой задаче