Revert "fix: allow SPACK_CHERRYPICKS to work with space separate cherrypicks"
1 unresolved thread
This reverts commit 4ab1b22a.
Merge request reports
Activity
requested review from @veprbl
assigned to @wdconinc
43 43 git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} 44 44 git -C ${SPACK_ROOT} checkout ${SPACK_VERSION} 45 45 if [ -n "${SPACK_CHERRYPICKS}" ] ; then 46 SPACK_CHERRYPICKS=$(git -C ${SPACK_ROOT} rev-list --topo-order ${SPACK_CHERRYPICKS} | grep -m $(echo ${SPACK_CHERRYPICKS} | wc -w) -e ${SPACK_CHERRYPICKS// / -e } | tac) 46 SPACK_CHERRYPICKS=$(git -C ${SPACK_ROOT} rev-list --topo-order ${SPACK_CHERRYPICKS} | grep -m $(echo ${SPACK_CHERRYPICKS} | wc -w) "${SPACK_CHERRYPICKS}" | tac) @veprbl Originally (with
-e), this took a newline-separated list of cherry-pick hashes in SPACK_CHERRYPICKS, and aimed to grep each of the individual cherry hashes. This failed to work when GitHub turned the docker build-arg into a space-separated list. The-etrick turned this into-e hash1 -e hash2 -e hash3which still matched each individual hash, but now fails for gitlab's newline-separated list... Annoying.
Cherry-picks again applied correctly, see e.g. https://eicweb.phy.anl.gov/containers/eic_container/-/jobs/3144620#L552.
Please register or sign in to reply