Mercurial > public > mercurial-scm > hg-stable

changeset 52902:e02a286c1968

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ci: use the rust wheel to test the main rust test Lets see if it works.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 12 Dec 2024 11:04:43 +0000
parents 811584a7fa99
children d5f8a336e2ef
files contrib/heptapod-ci.yml
diffstat 1 files changed, 21 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/heptapod-ci.yml	Thu Dec 12 00:51:26 2024 +0000
+++ b/contrib/heptapod-ci.yml	Thu Dec 12 11:04:43 2024 +0000
@@ -231,8 +231,10 @@
              test -n "$WHEEL";
              echo installing from $WHEEL;
              WHEEL_ARG="--hg-wheel $WHEEL";
-             echo disabling flavor as this is currently incompatible with '"--hg-wheel"';
-             FLAVOR="";
+             if [[ -n "$FLAVOR"  ]] && [[ "$FLAVOR" != "--rust" ]]; then
+               echo disabling flavor '"'$FLAVOR'"' as this is currently incompatible with '"--hg-wheel"';
+               FLAVOR="";
+             fi
           else
             echo installing from source;
           fi;
@@ -298,12 +300,25 @@
     variables:
         FLAVOR: "--pure"
 
-test-rust:
+.test-rust:
     extends: .runtests-no-check
     variables:
         HGWITHRUSTEXT: "cpython"
         FLAVOR: "--rust"
 
+test-rust:
+    extends: .test-rust
+    variables:
+        HGWITHRUSTEXT: "cpython"
+        FLAVOR: "--rust"
+    needs:
+      - job: build-rust-wheel
+        parallel:
+          matrix:
+            - BUILD_PY_ID: "cp311-cp311"
+    variables:
+        WHEEL_TYPE: "rust"
+
 test-rhg:
     extends: .runtests-no-check
     variables:
@@ -360,7 +375,7 @@
             - BUILD_PY_ID: "cp312-cp312"
 
 test-3.12-rust:
-    extends: test-rust
+    extends: .test-rust
     stage: py-version-compat
     needs:
       - trigger-pycompat
@@ -379,7 +394,7 @@
             - BUILD_PY_ID: "cp313-cp313"
 
 test-3.13-rust:
-    extends: test-rust
+    extends: .test-rust
     stage: py-version-compat
     needs:
       - trigger-pycompat
@@ -387,7 +402,7 @@
         PYTHON: python3.13
 
 check-pytype:
-    extends: test-rust
+    extends: .test-rust
     stage: checks
     before_script:
       - export PATH="/home/ci-runner/vendor/pyenv/pyenv-2.4.7-adf3c2bccf09cdb81febcfd15b186711a33ac7a8/shims:/home/ci-runner/vendor/pyenv/pyenv-2.4.7-adf3c2bccf09cdb81febcfd15b186711a33ac7a8/bin:$PATH"