diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml index 9ba00a9dc6eaa6518d45f483e95c9c269e205441_Y29udHJpYi9oZXB0YXBvZC1jaS55bWw=..6b57144792881bb9cda37d43c59d2b8001177981_Y29udHJpYi9oZXB0YXBvZC1jaS55bWw= 100644 --- a/contrib/heptapod-ci.yml +++ b/contrib/heptapod-ci.yml @@ -26,17 +26,6 @@ - echo "$RUNTEST_ARGS" - HGTESTS_ALLOW_NETIO="$TEST_HGTESTS_ALLOW_NETIO" HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" tests/run-tests.py --color=always $RUNTEST_ARGS - -.rust_template: &rust - before_script: - - hg clone . /tmp/mercurial-ci/ --noupdate --config phases.publish=no - - hg -R /tmp/mercurial-ci/ update `hg log --rev '.' --template '{node}'` - - ls -1 tests/test-check-*.* > /tmp/check-tests.txt - - cd /tmp/mercurial-ci/rust/rhg - - cargo build --release - - cd /tmp/mercurial-ci/ - - checks-py2: <<: *runtests variables: @@ -95,7 +84,6 @@ test-py2-rust: <<: *runtests - <<: *rust variables: HGWITHRUSTEXT: cpython RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" @@ -103,10 +91,9 @@ test-py3-rust: <<: *runtests - <<: *rust variables: HGWITHRUSTEXT: cpython RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" PYTHON: python3 TEST_HGMODULEPOLICY: "rust+c" @@ -107,9 +94,17 @@ variables: HGWITHRUSTEXT: cpython RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" PYTHON: python3 TEST_HGMODULEPOLICY: "rust+c" +test-py3-rhg: + <<: *runtests + variables: + HGWITHRUSTEXT: cpython + RUNTEST_ARGS: "--rust --rhg --blacklist /tmp/check-tests.txt" + PYTHON: python3 + TEST_HGMODULEPOLICY: "rust+c" + test-py2-chg: <<: *runtests variables: