Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge mercurial-4.7 into mercurial-4.6 mercurial-4.6
authorAnton Shestakov <av6@dwimlabs.net>
Mon, 02 Dec 2019 20:59:04 +0700
branchmercurial-4.6
changeset 4980 cfd31edaa4c7
parent 4978 777a352d2ade (current diff)
parent 4979 c46f0430a668 (diff)
child 4987 e1f53a68b146
child 5091 308c1e09f80f
test-compat: merge mercurial-4.7 into mercurial-4.6
--- a/.gitlab-ci.yml	Mon Dec 02 14:44:31 2019 +0100
+++ b/.gitlab-ci.yml	Mon Dec 02 20:59:04 2019 +0700
@@ -9,7 +9,8 @@
         - 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; /ci/repos/mercurial/tests/run-tests.py --color=always)
+        - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()')
+        - (cd tests; /ci/repos/mercurial/tests/run-tests.py -j $jobs --color=always)
 
 tests-py2-pure:
     image: octobus/ci-py2-hgext3rd
@@ -17,4 +18,5 @@
         - 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; /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
+        - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()')
+        - (cd tests; /ci/repos/mercurial/tests/run-tests.py -j $jobs --color=always --pure)
evolve