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 2

Update regex to allow for Debian family architectures and tarballs correctly

Browse source
This commit is contained in:
David Murphy 2023-01-26 09:22:35 -07:00 • committed by Pedro Algarvio
parent 6ee6784d24
commit efc733050f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkg/tests/conftest.py
View file

@ -29,7 +29,7 @@ def version():
_version = ""
for artifact in ARTIFACTS_DIR.glob("**/*.*"):
_version = re.search(
r"([0-9].*)(\-[0-9].fc|\-[0-9].el|\+ds|\-[0-9].am|(\-[0-9]-[a-z]*-[a-z]*[0-9_]*.|\-[0-9]*.*)(tar.gz|zip|exe|pkg|rpm))",
r"([0-9].*)(\-[0-9].fc|\-[0-9].el|\+ds|\_all|\_any|\_amd64|\_arm64|\-[0-9].am|(\-[0-9]-[a-z]*-[a-z]*[0-9_]*.|\-[0-9]*.*)(tar.gz|tar.xz|zip|exe|pkg|rpm|deb))",
artifact.name,
)
if _version:
@ -37,8 +37,8 @@ def version():
_version.groups()[0]
.replace("_", "-")
.replace("~", "")
.replace("-py3-x86-64", "")
)
_version = _version.split("-")[0]
break
return _version