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:
Родитель
be8b5a8dd0
Коммит
5f33f7d81a
|
@ -158,10 +158,18 @@ def _get_current_release(organization, override_version):
|
||||||
# Distro returns empty strings on Windows currently, so don't even send
|
# Distro returns empty strings on Windows currently, so don't even send
|
||||||
distro_name = distro.id() or None
|
distro_name = distro.id() or None
|
||||||
distro_version = distro.version() 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(
|
release = client.get_clienttool_release(
|
||||||
"ArtifactTool",
|
"ArtifactTool",
|
||||||
os_name=platform.system(),
|
os_name=os_name,
|
||||||
arch=platform.machine(),
|
arch=arch,
|
||||||
distro_name=distro_name,
|
distro_name=distro_name,
|
||||||
distro_version=distro_version,
|
distro_version=distro_version,
|
||||||
version=override_version)
|
version=override_version)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче