# HG changeset patch # User Georges Racinet <georges.racinet@octobus.net> # Date 1587666051 -7200 # Thu Apr 23 20:20:51 2020 +0200 # Branch heptapod-0-12 # Node ID 4aabd4184152def55d4e18a4ed78e41a41827473 # Parent f17801d94fb903fadd5959597de56be83bae4791 Fixed hg versions to 5.3.x for this stable branch In this branch, we won't care about Mercurial 5.4, for which our tests are broken. The tests broken on the hg stable and default branches have already been fixed in the default branch of this project. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,10 +2,6 @@ - main - compat -variables: - EVOLVE_REPO_URL: https://mirror.octobus.net/evolve - EVOLVE_LOCAL_REPO: /ci/repos/evolve - before_script: # py.test and friends are in the py-heptapod image only # the py.test version combination is the consistent one @@ -29,33 +25,3 @@ - PYTHONPATH=/ci/repos/mercurial python -c "from mercurial import util; print(util.version())" - PYTHONPATH=/ci/repos/mercurial PATH=$HOME/.local/bin:$PATH ./run-all-tests - -tests-hg-stable: - stage: compat - image: octobus/ci-py2-hgext3rd - script: - - hg pull -R /ci/repos/mercurial/ --rev stable - - hg -R /ci/repos/mercurial/ update stable - - hg -R /ci/repos/mercurial summary - - (cd /ci/repos/mercurial; make local) - - hg clone -r stable -u stable $EVOLVE_REPO_URL $EVOLVE_LOCAL_REPO - - pip install --user $EVOLVE_LOCAL_REPO - - pip install --user hg+https://foss.heptapod.net/mercurial/hg-git@default#egg=hggit - - /ci/repos/mercurial/hg version --debug - - PYTHONPATH=/ci/repos/mercurial python -c "from mercurial import util; print(util.version())" - - PYTHONPATH=/ci/repos/mercurial PATH=$HOME/.local/bin:$PATH ./run-all-tests - -tests-hg-default: - stage: compat - allow_failure: true - image: octobus/ci-py2-hgext3rd - script: - - hg pull -R /ci/repos/mercurial/ --rev default - - hg -R /ci/repos/mercurial/ update default - - hg -R /ci/repos/mercurial summary - - make -C /ci/repos/mercurial local - - hg clone -r stable -u stable $EVOLVE_REPO_URL $EVOLVE_LOCAL_REPO - - pip install --user $EVOLVE_LOCAL_REPO - - pip install --user hg+https://foss.heptapod.net/mercurial/hg-git@default#egg=hggit - - PYTHONPATH=/ci/repos/mercurial python -c "from mercurial import util; print(util.version())" - - PYTHONPATH=/ci/repos/mercurial PATH=$HOME/.local/bin:$PATH ./run-all-tests diff --git a/install-requirements.txt b/install-requirements.txt --- a/install-requirements.txt +++ b/install-requirements.txt @@ -1,3 +1,3 @@ -Mercurial>=5.2 +Mercurial>=5.2,<5.4 hg-evolve>=9.2.1 hg-git>=0.8.13