Use x86_64 version of artifact tool for M1 macs (using Rosetta) (#1210)

* Use x86_64 version of artifact tool for M1 macs (using Rosetta)

* Update artifacttool_updater.py
This commit is contained in:
Dale 2021-10-13 16:20:40 +01:00 коммит произвёл GitHub
Родитель be8b5a8dd0
Коммит 5f33f7d81a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 10 добавлений и 2 удалений

Просмотреть файл

@ -158,10 +158,18 @@ def _get_current_release(organization, override_version):
# Distro returns empty strings on Windows currently, so don't even send
distro_name = distro.id() or None
distro_version = distro.version() or None
os_name = platform.system()
arch = platform.machine()
# For M1 macs, there is no version of artifact tool. However, the x86_64
# version can run under Rosetta, so we use that instead.
if os_name == "Darwin" and arch in ["amd64", "arm64"]:
arch = "x86_64"
release = client.get_clienttool_release(
"ArtifactTool",
os_name=platform.system(),
arch=platform.machine(),
os_name=os_name,
arch=arch,
distro_name=distro_name,
distro_version=distro_version,
version=override_version)