changeset 6752:44e41905b289 mercurial-6.6

test-compat: merge stable into mercurial-6.6
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 11 Apr 2024 01:58:03 -0300
parents 07a9cd7cbfc6 (diff) 21b51b2bbf09 (current diff)
children fdfd10e5705f dc39bd5d9bb8
files .gitlab-ci.yml
diffstat 1 files changed, 2 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.gitlab-ci.yml	Wed Apr 03 05:07:39 2024 -0300
+++ b/.gitlab-ci.yml	Thu Apr 11 01:58:03 2024 -0300
@@ -27,8 +27,8 @@
         - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt)
     script:
         - *prepare_hg
-        - ($PYTHON --version)
-        - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS)
+        - ("$PYTHON" --version)
+        - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS)
 
 checks-py3:
     <<: *runtests
@@ -47,16 +47,6 @@
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
-tests-py2-6.1:
-    <<: *runtests
-    variables:
-        PY: py2
-        PYTHON: prlimit --nofile=1024:1024 python2
-        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
-        TEST_HGMODULEPOLICY: "c"
-        HG_BRANCH: 'max(tag("re:^6\.1"))'
-    allow_failure: true
-
 doc:
     image: registry.heptapod.net/mercurial/ci-images/py3-evolve-doc
     script: