hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gitlab ci: fix untouched spec pruning on windows (#44279)

Browse source 
Use correct path separator in get_all_package_diffs for all platforms.
Ensures correct package change computation on Windows when pruning unchanged specs in Gitlab CI
This commit is contained in:
Scott Wittenburg 2024-05-20 18:56:48 -06:00 committed by Harmen Stoppels
parent a3bc9dbfe8
commit 1b14170bd1
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/spack/spack/repo.py
View file

@ -241,7 +241,7 @@ def get_all_package_diffs(type, rev1="HEAD^1", rev2="HEAD"):
Arguments: Arguments:
type (str): String containing one or more of 'A', 'B', 'C' type (str): String containing one or more of 'A', 'R', 'C'
rev1 (str): Revision to compare against, default is 'HEAD^' rev1 (str): Revision to compare against, default is 'HEAD^'
rev2 (str): Revision to compare to rev1, default is 'HEAD' rev2 (str): Revision to compare to rev1, default is 'HEAD'
@ -264,7 +264,7 @@ def get_all_package_diffs(type, rev1="HEAD^1", rev2="HEAD"):
lines = [] if not out else re.split(r"\s+", out) lines = [] if not out else re.split(r"\s+", out)
changed = set() changed = set()
for path in lines: for path in lines:
pkg_name, _, _ = path.partition(os.sep) pkg_name, _, _ = path.partition("/")
if pkg_name not in added and pkg_name not in removed: if pkg_name not in added and pkg_name not in removed:
changed.add(pkg_name) changed.add(pkg_name)