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

feat: merge topo sorted cherry-picks

parent f4534780
No related branches found
No related tags found
1 merge request!743feat: merge topo sorted cherry-picks
...@@ -31,6 +31,12 @@ ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/ ...@@ -31,6 +31,12 @@ ADD https://api.github.com/repos/${SPACK_ORGREPO}/commits/${SPACK_VERSION} /tmp/
RUN git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} \ RUN git clone --filter=tree:0 https://github.com/${SPACK_ORGREPO}.git ${SPACK_ROOT} \
&& git -C ${SPACK_ROOT} checkout ${SPACK_VERSION} \ && git -C ${SPACK_ROOT} checkout ${SPACK_VERSION} \
&& if [ -n "${SPACK_CHERRYPICKS}" ] ; then \ && if [ -n "${SPACK_CHERRYPICKS}" ] ; then \
SPACK_CHERRYPICKS=$( \
git -C ${SPACK_ROOT} rev-list --topo-order ${SPACK_CHERRYPICKS} \
| grep -m $(echo ${SPACK_CHERRYPICKS} | wc -w) \
"${SPACK_CHERRYPICKS}" \
| tac \
) ; \
git -C ${SPACK_ROOT} cherry-pick -n ${SPACK_CHERRYPICKS} ; \ git -C ${SPACK_ROOT} cherry-pick -n ${SPACK_CHERRYPICKS} ; \
fi \ fi \
&& ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash \ && ln -s $SPACK_ROOT/share/spack/docker/entrypoint.bash \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment