From 51506d8784efac6e709da6364b8809a14512362b Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 29 Nov 2023 22:27:54 +0000 Subject: [PATCH] MacOS packages include `arm64` in their name, not `aarch64` Signed-off-by: Pedro Algarvio --- pkg/tests/download/test_pkg_download.py | 2 -- tools/precommit/workflows.py | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/tests/download/test_pkg_download.py b/pkg/tests/download/test_pkg_download.py index 81542ec4583..f14114d143e 100644 --- a/pkg/tests/download/test_pkg_download.py +++ b/pkg/tests/download/test_pkg_download.py @@ -401,8 +401,6 @@ def setup_macos( ): arch = os.environ.get("SALT_REPO_ARCH") or "x86_64" if package_type == "package": - if arch == "aarch64": - arch = "arm64" if packaging.version.parse(salt_release) > packaging.version.parse("3005"): mac_pkg = f"salt-{salt_release}-py3-{arch}.pkg" diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index b749edf907f..2946ae9f279 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -266,8 +266,12 @@ def generate_workflows(ctx: Context): continue test_salt_pkg_downloads_listing["linux"].append((slug, arch, "onedir")) for slug, display_name, arch in build_ci_deps_listing["macos"]: + if arch == "aarch64": + arch = "arm64" test_salt_pkg_downloads_listing["macos"].append((slug, arch, "package")) for slug, display_name, arch in build_ci_deps_listing["macos"][-1:]: + if arch == "aarch64": + arch = "arm64" test_salt_pkg_downloads_listing["macos"].append((slug, arch, "onedir")) for slug, display_name, arch in build_ci_deps_listing["windows"][-1:]: for pkg_type in ("nsis", "msi", "onedir"):