diff --git a/contrib/heptapod-ci.yml b/contrib/heptapod-ci.yml --- a/contrib/heptapod-ci.yml +++ b/contrib/heptapod-ci.yml @@ -25,17 +25,6 @@ - echo "$RUNTEST_ARGS" - 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: @@ -92,7 +81,6 @@ test-py2-rust: <<: *runtests - <<: *rust variables: HGWITHRUSTEXT: cpython RUNTEST_ARGS: "--rust --blacklist /tmp/check-tests.txt" @@ -100,13 +88,20 @@ test-py3-rust: <<: *runtests - <<: *rust 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: