Skip to content
Snippets Groups Projects
Commit 573e6d63 authored by Wouter Deconinck's avatar Wouter Deconinck
Browse files

cherry-pick: Consolidate concretization output for environments

parent 68a55593
No related branches found
No related tags found
1 merge request!937fix: print more condensed concretization output
Pipeline #96249 passed
Stage: status-pending
Stage: config
Stage: base
Stage: eic
Stage: benchmarks
Stage: finalize
Stage: status-report
Pipeline: reconstruction_benchmarks

#96296

    Pipeline: reconstruction_benchmarks

    #96290

      Pipeline: detector_benchmarks

      #96289

        +7
        This commit is part of merge request !937. Comments created here will be created in the context of that merge request.
        Hide whitespace changes
        Inline Side-by-side
        containers/jug/dev.Dockerfile
        + 2
        − 2
        View file @ 573e6d63
        ...@@ -151,7 +151,7 @@ mkdir -p /var/cache/spack/blobs/sha256/ ...@@ -151,7 +151,7 @@ mkdir -p /var/cache/spack/blobs/sha256/
        find /var/cache/spack/blobs/sha256/ -ignore_readdir_race -atime +7 -delete find /var/cache/spack/blobs/sha256/ -ignore_readdir_race -atime +7 -delete
        echo -e "\n view: false" >> ${SPACK_ENV}/spack.yaml echo -e "\n view: false" >> ${SPACK_ENV}/spack.yaml
        spack env activate --dir ${SPACK_ENV} spack env activate --dir ${SPACK_ENV}
        spack concretize --fresh --force --quiet spack concretize --fresh --force
        make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
        SPACK_ENV=${SPACK_ENV} \ SPACK_ENV=${SPACK_ENV} \
        BUILDCACHE_OCI_PROMPT="eicweb" \ BUILDCACHE_OCI_PROMPT="eicweb" \
        ...@@ -204,7 +204,7 @@ if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then ...@@ -204,7 +204,7 @@ if [ "${JUGGLER_VERSION}" != "df87bf1f8643afa8e80bece9d36d6dc26dfe8132" ] ; then
        sed -i "/# JUGGLER_VERSION$/ s/@[^' ]*/@git.${JUGGLER_VERSION}=main/" /opt/spack-environment/packages.yaml sed -i "/# JUGGLER_VERSION$/ s/@[^' ]*/@git.${JUGGLER_VERSION}=main/" /opt/spack-environment/packages.yaml
        spack deconcretize -y --all juggler spack deconcretize -y --all juggler
        fi fi
        spack concretize --fresh --force --quiet spack concretize --fresh --force
        make --jobs ${jobs} --keep-going --directory /opt/spack-environment \ make --jobs ${jobs} --keep-going --directory /opt/spack-environment \
        SPACK_ENV=${SPACK_ENV} \ SPACK_ENV=${SPACK_ENV} \
        BUILDCACHE_OCI_FINAL="eicweb" \ BUILDCACHE_OCI_FINAL="eicweb" \
        ......
        spack.sh
        + 2
        − 0
        View file @ 573e6d63
        ...@@ -13,6 +13,7 @@ f6d50f790ee8b123f7775429f6ca6394170e6de9 ...@@ -13,6 +13,7 @@ f6d50f790ee8b123f7775429f6ca6394170e6de9
        63f6e6079aacc99078386e5c8ff06173841b9595 63f6e6079aacc99078386e5c8ff06173841b9595
        9bcc43c4c158639fa6cb575c6106595a34682081 9bcc43c4c158639fa6cb575c6106595a34682081
        9f3e45ddbee24aaa7993e575297827e0aed2e6fe 9f3e45ddbee24aaa7993e575297827e0aed2e6fe
        85f13442d2a7486daba81fdd9a3b6a1182ba11f6
        --- ---
        ## Optional hash table with comma-separated file list ## Optional hash table with comma-separated file list
        read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
        ...@@ -25,3 +26,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \ ...@@ -25,3 +26,4 @@ read -r -d '' SPACK_CHERRYPICKS_FILES <<- \
        ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list> ## 63f6e6079aacc99078386e5c8ff06173841b9595: gaudi: upstream patch when @38.1 for missing #include <list>
        ## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21" ## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21"
        ## 9f3e45ddbee24aaa7993e575297827e0aed2e6fe: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES ## 9f3e45ddbee24aaa7993e575297827e0aed2e6fe: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES
        ## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments
        \ No newline at end of file
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Please register or to comment