diff --git a/spack-environment/Makefile b/spack-environment/Makefile index 6195ba40d0e107394e9d0bd12424f3527b7d033d..9b363d3b3b30d7f0147de33b82012e12d860250c 100644 --- a/spack-environment/Makefile +++ b/spack-environment/Makefile @@ -25,7 +25,7 @@ $(SPACK_ENV)/push: $(addprefix $(SPACK_ENV)/push/,$($(SPACK_ENV)/SPACK_PACKAGE_I $(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache push --unsigned $(buildcache) ;) $(foreach buildcache, $(BUILDCACHE_S3_FINAL), $(SPACK) buildcache update-index $(buildcache) ;) $(foreach buildcache, $(BUILDCACHE_S3_PROMPT), $(SPACK) buildcache update-index $(buildcache) ;) - $(foreach buildcache, $(BUILDCACHE_OCI_FINAL), $(SPACK) buildcache push --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) ;) + $(foreach buildcache, $(BUILDCACHE_OCI_FINAL), $(SPACK) buildcache push --unsigned --base-image $(BUILDCACHE_OCI_BASE_IMAGE) $(buildcache) | grep -v "Using cached archive" ;) $(SPACK_ENV)/push/%: $(SPACK_ENV)/install/% @mkdir -p $(dir $@) diff --git a/spack.sh b/spack.sh index ca1a57906286c46769c958a95224e841db6527c3..5d11bb4b70573cb2beb12c736e96255527bf9de1 100644 --- a/spack.sh +++ b/spack.sh @@ -13,6 +13,7 @@ f6d50f790ee8b123f7775429f6ca6394170e6de9 63f6e6079aacc99078386e5c8ff06173841b9595 9bcc43c4c158639fa6cb575c6106595a34682081 9f3e45ddbee24aaa7993e575297827e0aed2e6fe +85f13442d2a7486daba81fdd9a3b6a1182ba11f6 --- ## Optional hash table with comma-separated file list 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> ## 9bcc43c4c158639fa6cb575c6106595a34682081: protobuf: update hash for patch needed when="@3.4:3.21" ## 9f3e45ddbee24aaa7993e575297827e0aed2e6fe: acts: pass cuda_arch to CMAKE_CUDA_ARCHITECTURES +## 85f13442d2a7486daba81fdd9a3b6a1182ba11f6: Consolidate concretization output for environments \ No newline at end of file