diff options
author | Harmen Stoppels <harmenstoppels@gmail.com> | 2022-11-16 15:02:56 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-16 14:02:56 +0000 |
commit | d18cccf7c59d2c18d6f3bd12add7e5b69455c021 (patch) | |
tree | 4334769bf8a9e7c53c7051181bb3728dd7195a1b | |
parent | fbe6b4b48645952e2e0893cc8e68543addcbec4a (diff) | |
download | spack-d18cccf7c59d2c18d6f3bd12add7e5b69455c021.tar.gz spack-d18cccf7c59d2c18d6f3bd12add7e5b69455c021.tar.bz2 spack-d18cccf7c59d2c18d6f3bd12add7e5b69455c021.tar.xz spack-d18cccf7c59d2c18d6f3bd12add7e5b69455c021.zip |
spack env depfile in Gitlab CI should use `install-deps/pkg-version-hash` target (#33936)
-rw-r--r-- | lib/spack/spack/cmd/ci.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/spack/spack/cmd/ci.py b/lib/spack/spack/cmd/ci.py index 6822772139..f82dbba4ae 100644 --- a/lib/spack/spack/cmd/ci.py +++ b/lib/spack/spack/cmd/ci.py @@ -570,8 +570,6 @@ def ci_rebuild(args): "-o", "Makefile", "--use-buildcache=package:never,dependencies:only", - "--make-target-prefix", - "ci", slash_hash, # limit to spec we're building ], [ @@ -588,7 +586,7 @@ def ci_rebuild(args): "SPACK_COLOR=always", "SPACK_INSTALL_FLAGS={}".format(args_to_string(deps_install_args)), "-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, ] |