From fa6faa97ab378cad14c942e2adaae967a7f9000b Mon Sep 17 00:00:00 2001 From: "Daniel A. Wozniak" Date: Sat, 9 Nov 2024 22:49:42 -0700 Subject: [PATCH] pkg matrix fix for arm --- tools/ci.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/ci.py b/tools/ci.py index e02ced417fe..608654476dd 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -19,7 +19,7 @@ from ptscripts import Context, command_group import tools.utils import tools.utils.gh -from tools.precommit.workflows import TEST_SALT_LISTING +from tools.precommit.workflows import TEST_SALT_LISTING, TEST_SALT_PKG_LISTING if sys.version_info < (3, 11): from typing_extensions import NotRequired, TypedDict @@ -880,7 +880,7 @@ def pkg_matrix( arch == "arm64" and name not in ["windows", "macos"] and "LINUX_ARM_RUNNER" not in os.environ - and os.environ["LINUX_ARM_RUNNER"] != "0" + or os.environ["LINUX_ARM_RUNNER"] != "0" ): ctx.warn("This fork does not have a linux arm64 runner configured.") _matrix.clear() @@ -1564,7 +1564,12 @@ def workflow_config( "build-pkgs": True, "build-deps-ci": True, } - from tools.precommit.workflows import TEST_SALT_LISTING, TEST_SALT_PKG_LISTING + if skip_tests: + jobs["test"] = False + if skip_pkg_tests: + jobs["test-pkg"] = False + if skip_pkg_download_tests: + jobs["test-pkg-download"] = False jobs.update({_.job_name: True for _ in TEST_SALT_LISTING["linux"]}) jobs.update({_.job_name: True for _ in TEST_SALT_LISTING["windows"]})