saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

pkg matrix fix for arm

Browse source
This commit is contained in:
Daniel A. Wozniak 2024-11-09 22:49:42 -07:00 • committed by Daniel Wozniak
parent 62d1c5d76d
commit fa6faa97ab
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/ci.py
View file

@ -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"]})