diff .gitlab-ci.yml @ 6187:df8df57a3ce3 mercurial-5.0

test-compat: merge mercurial-5.1 into mercurial-5.0

--- a/.gitlab-ci.yml	Tue Feb 22 18:14:26 2022 +0300
+++ b/.gitlab-ci.yml	Tue Feb 22 18:21:24 2022 +0300
@@ -34,13 +34,6 @@
     variables:
         RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
 
-checks-py3:
-    <<: *runtests
-    variables:
-        PY: py3
-        PYTHON: python3
-        RUNTEST_ARGS: "--test-list /tmp/check-tests.txt"
-
 tests-py2-cext:
     <<: *runtests
     variables:
@@ -52,70 +45,3 @@
     variables:
         RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt"
         TEST_HGMODULEPOLICY: "py"
-
-tests-py3-cext:
-    <<: *runtests
-    variables:
-        PY: py3
-        PYTHON: python3
-        RUNTEST_ARGS: "--blacklist /tmp/check-tests.txt"
-        TEST_HGMODULEPOLICY: "c"
-
-tests-py3-pure:
-    <<: *runtests
-    variables:
-        PY: py3
-        PYTHON: python3
-        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
-        PYTHON: python3
-        PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH"
-        SPHINXBUILD: python3 -m sphinx -b html
-    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'
-    script:
-        - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && tests/testlib/update-hg-repo.sh C:/Temp/hg'
-        - >
-          C:/MinGW/msys/1.0/bin/sh.exe --login -c '
-          cd "$OLDPWD" &&
-          evo_branch=$(hg identify --branch) &&
-          hg_branch=${HG_BRANCH:-$(tests/testlib/map-hg-rev.sh "$evo_branch")} &&
-          hg -R C:/Temp/hg update "$hg_branch" &&
-          hg_rev=$(hg log -R C:/Temp/hg -r . -T "\{node\}") &&
-          echo testing with mercurial branch="$hg_branch", revision="$hg_rev"'
-        - Invoke-Expression "$Env:PYTHON --version"
-        - echo "$Env:RUNTEST_ARGS"
-        - C:/MinGW/msys/1.0/bin/sh.exe --login -c 'cd "$OLDPWD" && HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON C:/Temp/hg/tests/run-tests.py --color=always $RUNTEST_ARGS'
-
-windows-py3:
-    <<: *windows_runtests
-    tags:
-        - windows
-    variables:
-        PYTHON: py -3
-        RUNTEST_ARGS: "--blacklist C:/Temp/check-tests.txt"
-        TEST_HGMODULEPOLICY: "c"
-    when: manual