Commit b025bbe3 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Branches: getting back to stable evolve for stable Mercurial

In particular, I got confirmation that the stable branch of evolve
is supposed to be compatible with the stable branch of Mercurial (and
not to be preparation for a potential evolve bugfix release).
Temporary incompatibilities of course always happen when a new release
candidate for Mercurial is pushed, bumping its stable branch: shortly
afterwards, the default branch of evolve is promoted to stable. Usually
we don't notice, but the incompatibility stayed a bit longer than usual
in the case of 5.7rc.
parent 5d9d3b21eb7a
Pipeline #18424 passed with stages
in 5 minutes and 26 seconds
......@@ -2,8 +2,6 @@
FROM octobus/ci-py3-hgext3rd as hgsrc
ARG HG_BRANCH
# temporarily using evolve-default for hg-stable because evolve-stable
# is not yet compatible with 5.7rc
RUN hg pull -R /ci/repos/mercurial/ --rev ${HG_BRANCH} && \
hg -R /ci/repos/mercurial/ update ${HG_BRANCH} && \
hg -R /ci/repos/mercurial summary && \
......@@ -7,7 +5,7 @@
RUN hg pull -R /ci/repos/mercurial/ --rev ${HG_BRANCH} && \
hg -R /ci/repos/mercurial/ update ${HG_BRANCH} && \
hg -R /ci/repos/mercurial summary && \
hg clone --noupdate -r default https://mirror.octobus.net/evolve /ci/repos/evolve && \
hg clone --noupdate -r ${HG_BRANCH} https://mirror.octobus.net/evolve /ci/repos/evolve && \
hg -R /ci/repos/evolve summary && \
mkdir -p /ci/tarballs && \
hg -R /ci/repos/mercurial archive -t tar /ci/tarballs/mercurial.tar && \
......@@ -11,7 +9,7 @@
hg -R /ci/repos/evolve summary && \
mkdir -p /ci/tarballs && \
hg -R /ci/repos/mercurial archive -t tar /ci/tarballs/mercurial.tar && \
hg -R /ci/repos/evolve archive -r default -t tar /ci/tarballs/evolve.tar
hg -R /ci/repos/evolve archive -r ${HG_BRANCH} -t tar /ci/tarballs/evolve.tar
FROM registry.heptapod.net:443/heptapod/ci-images/fixed-pydeps:${PYDEPS_TAG}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment