test-compat: merge mercurial-5.0 into mercurial-4.9 mercurial-4.9
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 02 Dec 2019 14:42:32 +0100
branchmercurial-4.9
changeset 4975 6bc70f78724c
parent 4969 12ad2ec5e8a4 (current diff)
parent 4974 3bcdaf298c7a (diff)
child 4976 6b306af9f52a
child 5088 7a1d6e392995
test-compat: merge mercurial-5.0 into mercurial-4.9
--- a/.gitlab-ci.yml	Thu Nov 28 10:50:55 2019 +0100
+++ b/.gitlab-ci.yml	Mon Dec 02 14:42:32 2019 +0100
@@ -18,19 +18,3 @@
         - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
         - hg -R /ci/repos/mercurial/ update "$hg_rev"
         - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
-
-tests-py3-cext:
-    image: octobus/ci-py3-hgext3rd
-    script:
-        - hg pull -R /ci/repos/mercurial/
-        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
-        - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always)
-
-tests-py3-pure:
-    image: octobus/ci-py3-hgext3rd
-    script:
-        - hg pull -R /ci/repos/mercurial/
-        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
-        - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always --pure)