diff .gitlab-ci.yml @ 6345:6ab7c7964ad3 mercurial-6.0

test-compat: merge mercurial-6.1 into mercurial-6.0

--- a/.gitlab-ci.yml	Thu Dec 08 19:05:29 2022 +0400
+++ b/.gitlab-ci.yml	Thu Dec 08 19:17:00 2022 +0400
@@ -1,6 +1,5 @@
 .prepare_hg: &prepare_hg
     - hg pull -R /ci/repos/mercurial/
-    - hg pull -R /ci/repos/mercurial/ https://www.mercurial-scm.org/repo/hg-committed
     - hg_branch=${HG_BRANCH:-$(tests/testlib/map-hg-rev.sh "$(hg identify --branch)")}
     - hg -R /ci/repos/mercurial/ update "$hg_branch"
     - hg_rev=$(hg log -R /ci/repos/mercurial/ -r . -T '{node}')
@@ -30,11 +29,34 @@
         - ("$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: 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: python2
+        RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt"
+        TEST_HGMODULEPOLICY: "c"
+
+tests-py2-pure:
+    <<: *runtests
+    variables:
+        PY: py2
+        PYTHON: python2
+        RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
+        TEST_HGMODULEPOLICY: "py"
+
 tests-py3-cext:
     <<: *runtests
     variables:
@@ -47,38 +69,6 @@
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
 
-tests-py2-6.1:
-    <<: *runtests
-    variables:
-        PY: py2
-        PYTHON: 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:
-        - 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'
@@ -105,28 +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
-    script:
-        - apt-get update && apt-get -yq install devscripts equivs --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
-        - DEBEMAIL="[e-mail]" debchange --newversion "$debversion-1" "automated build"
-        - debuild --unsigned-source --unsigned-changes --build=binary
-        - dpkg --contents ../mercurial-evolve_$debversion-1_all.deb
-    variables:
-        DEBIAN_FRONTEND: noninteractive
-        DEB_BUILD_OPTIONS: nocheck nodoc
-    artifacts:
-        paths:
-            - debs/*.build
-            - debs/*.buildinfo
-            - debs/*.changes
-            - debs/*.deb
-    when: manual