changeset 46768:6b5714479288

ci: Add a job testing with rhg installed as `hg` This significantly increases test coverage of rhg, without duplicating many tests that already exist. The `cargo build` command being remove only compiled a `rhg` executable (as shown by the preceding `cd` command) but since a previous patch `run-tests.py --rhg` now takes care of that. Differential Revision: https://phab.mercurial-scm.org/D10196
author Simon Sapin <simon.sapin@octobus.net>
date Mon, 08 Mar 2021 21:04:51 +0100
parents 9ba00a9dc6ea
children c5912e35d06d
files contrib/heptapod-ci.yml
diffstat 1 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/heptapod-ci.yml	Wed Mar 10 13:54:46 2021 +0100
+++ b/contrib/heptapod-ci.yml	Mon Mar 08 21:04:51 2021 +0100
@@ -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,13 +91,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: