# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1719400761 -14400
# Node ID 241c4fec9723850d0a47a8bf3e2b686c03ba6d50
# Parent  5793b25f6525deba8e6121058703a287a07ec19c# Parent  e96e580cee0bd40b55b2a20c25508042ab6f0584
test-compat: merge mercurial-6.2 into mercurial-6.1

diff -r 5793b25f6525 -r 241c4fec9723 .gitlab-ci.yml
--- a/.gitlab-ci.yml	Wed Jun 26 15:02:24 2024 +0400
+++ b/.gitlab-ci.yml	Wed Jun 26 15:19:21 2024 +0400
@@ -26,14 +26,37 @@
         - (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-py2:
+    <<: *runtests
+    variables:
+        PY: py2
+        PYTHON: prlimit --nofile=1024:1024 python2
+        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
 
 checks-py3:
     <<: *runtests
     variables:
         RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
 
+tests-py2-cext:
+    <<: *runtests
+    variables:
+        PY: py2
+        PYTHON: prlimit --nofile=1024:1024 python2
+        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
+        TEST_HGMODULEPOLICY: "c"
+
+tests-py2-pure:
+    <<: *runtests
+    variables:
+        PY: py2
+        PYTHON: prlimit --nofile=1024:1024 python2
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
+        TEST_HGMODULEPOLICY: "py"
+
 tests-py3-cext:
     <<: *runtests
     variables:
@@ -46,28 +69,6 @@
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
-doc:
-    image: registry.heptapod.net/mercurial/ci-images/py3-evolve-doc
-    script:
-        - make doc
-    variables:
-        LANG: en_US.UTF-8
-        PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH"
-    artifacts:
-        paths:
-            - html/*
-
-sdist:
-    stage: .post
-    image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd
-    script:
-        - python3 setup.py sdist
-    artifacts:
-        paths:
-            - dist/*
-    only:
-        - tags
-
 .windows_runtests_template: &windows_runtests
     before_script:
         - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && ls -1 tests/test-check-*.t > C:/Temp/check-tests.txt'
@@ -94,30 +95,3 @@
         RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt"
         TEST_HGMODULEPOLICY: "c"
     when: manual
-
-deb:
-    image: registry.heptapod.net/mercurial/ci-images/py3-hgext3rd:v2.0
-    script:
-        - apt-get update && apt-get -yq install devscripts equivs lintian --no-install-recommends
-        - mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
-        - version=$($PYTHON setup.py --version)
-        - debversion="$version+hg$(date +%Y%m%d)+$(hg log -r . -T '{node|short}')"
-        - make deb-prepare
-        - mkdir -p debs
-        - mv ../mercurial-evolve_$version.orig debs/mercurial-evolve_$debversion.orig
-        - cd debs/mercurial-evolve_$debversion.orig
-        - debchange --newversion "$debversion-1" "automated build"
-        - debuild --unsigned-source --unsigned-changes --build=binary
-        - dpkg --contents ../mercurial-evolve_$debversion-1_all.deb
-    variables:
-        DEBEMAIL: evolve-testers@mercurial-scm.org
-        DEBFULLNAME: Evolve CI Package Builder
-        DEBIAN_FRONTEND: noninteractive
-        DEB_BUILD_OPTIONS: nocheck nodoc
-    artifacts:
-        paths:
-            - debs/*.build
-            - debs/*.buildinfo
-            - debs/*.changes
-            - debs/*.deb
-    when: manual