zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spack env depfile in Gitlab CI should use install-deps/pkg-version-hash target (#33936)

Browse Source
This commit is contained in:
Harmen Stoppels 2022-11-16 15:02:56 +01:00 committed by GitHub
parent fbe6b4b486
commit d18cccf7c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/spack/spack/cmd/ci.py
View File

@ -570,8 +570,6 @@ def ci_rebuild(args):
"-o", "-o",
"Makefile", "Makefile",
"--use-buildcache=package:never,dependencies:only", "--use-buildcache=package:never,dependencies:only",
"--make-target-prefix",
"ci",
slash_hash, # limit to spec we're building slash_hash, # limit to spec we're building
], ],
[ [
@ -588,7 +586,7 @@ def ci_rebuild(args):
"SPACK_COLOR=always", "SPACK_COLOR=always",
"SPACK_INSTALL_FLAGS={}".format(args_to_string(deps_install_args)), "SPACK_INSTALL_FLAGS={}".format(args_to_string(deps_install_args)),
"-j$(nproc)", "-j$(nproc)",
"ci/.install-deps/{}".format(job_spec.dag_hash()), "install-deps/{}".format(job_spec.format("{name}-{version}-{hash}")),
], ],
spack_cmd + ["install"] + root_install_args, spack_cmd + ["install"] + root_install_args,
] ]