Mercurial > evolve
view .gitlab-ci.yml @ 5561:d6b3f32f8261
evolve: add logic to decide local and other side before merge
Before we perform merge between the two content-divergent csets,
this logic decides which cset would reside at which side i.e.
local or other.
for e.g. in case of public content divergence where one side of
divergence is public, we always keep public one to local side.
(this logic of always keeping public one to local side may change in
future, but for now that's what it is.)
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Thu, 13 Aug 2020 17:22:19 +0530 |
parents | 98e2613d797d |
children | 0e23393dda9c |
line wrap: on
line source
.prepare_hg: &prepare_hg - hg pull -R /ci/repos/mercurial/ - 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}') - echo testing with mercurial branch="$hg_branch", revision="$hg_rev" pytype: image: octobus/ci-py3-hgext3rd script: - *prepare_hg - pytype --version - jobs=$(python -c 'import multiprocessing; print multiprocessing.cpu_count()') - pytype -P /ci/repos/mercurial/:hgext3rd -k hgext3rd -x hgext3rd/evolve/thirdparty -j $jobs || true when: manual variables: PY: py2 PYTHON: python RUNTEST_ARGS: "" TEST_HGMODULEPOLICY: "allow" .runtests_template: &runtests image: octobus/ci-$PY-hgext3rd before_script: - (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) checks-py2: <<: *runtests 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: RUNTEST_ARGS: "--no-rust --blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "c" tests-py2-pure: <<: *runtests variables: RUNTEST_ARGS: "--pure --blacklist /tmp/check-tests.txt" TEST_HGMODULEPOLICY: "py" tests-py3-cext: <<: *runtests variables: PY: py3 PYTHON: python3 RUNTEST_ARGS: "--no-rust --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: octobus/ci-py2-evolve-doc script: - cd docs/ - make variables: LANG: en_us.UTF-8 PYTHONPATH: "/ci/repos/mercurial:$PYTHONPATH" artifacts: paths: - html/*