Mercurial > forks > mercurial

changeset 53254:bec05cb1d78b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ci: switch back to debian based image The alpine based images are about ? slower to run the test. Most probably because of slowness from the "musl" libc. So we move back to slightly large image based on bookworm-slim that can run the test faster.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 15 May 2025 09:50:03 +0200
parents 5bb6a0ae7d6c
children 405ad4ef6088
files contrib/heptapod-ci.yml
diffstat 1 files changed, 19 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/heptapod-ci.yml	Wed May 07 12:25:56 2025 +0200
+++ b/contrib/heptapod-ci.yml	Thu May 15 09:50:03 2025 +0200
@@ -42,7 +42,7 @@
     RE_TOPIC: '/^topic/.+/.+$/'
     PYTHON: python
     HG_CI_REG: "registry.heptapod.net/mercurial/ci-images"
-    HG_CI_IMAGE_TAG: "v3.0"
+    HG_CI_IMAGE_TAG: "v3.1"
     # a directory dedicated to creating files and temporary clone
     # with shell runner, its content is not cleaned from one call to the next,
     # so plan for it.
@@ -146,26 +146,26 @@
 
 # build linux wheel for amd64
 build-c-wheel-libc:
-  extends: .extra-wheel
+  extends: .build-wheel
   variables:
     ARCH: "x86_64"
     WHEEL_TYPE: "c"
 
 build-rust-wheel-libc:
-  extends: .extra-wheel
+  extends: .build-wheel
   variables:
     ARCH: "x86_64"
     WHEEL_TYPE: "rust"
     CI_CLEVER_CLOUD_FLAVOR: "M"
 
 build-c-wheel-musl:
-  extends: .build-wheel
+  extends: .extra-wheel
   variables:
     ARCH: "x86_64-musl"
     WHEEL_TYPE: "c"
 
 build-rust-wheel-musl:
-  extends: .build-wheel
+  extends: .extra-wheel
   variables:
     ARCH: "x86_64-musl"
     WHEEL_TYPE: "rust"
@@ -299,10 +299,10 @@
     extends: .test-c
     image: "$HG_CI_REG/hg-core-test:$HG_CI_IMAGE_TAG"
     needs:
-      - job: build-c-wheel-musl
+      - job: build-c-wheel-libc
         parallel:
           matrix:
-            - BUILD_PY_ID: "cp312-cp312"
+            - BUILD_PY_ID: "cp311-cp311"
     variables:
         WHEEL_TYPE: "c"
 
@@ -326,10 +326,10 @@
         HGWITHRUSTEXT: "cpython"
         FLAVOR: "--rust"
     needs:
-      - job: build-rust-wheel-musl
+      - job: build-rust-wheel-libc
         parallel:
           matrix:
-            - BUILD_PY_ID: "cp312-cp312"
+            - BUILD_PY_ID: "cp311-cp311"
     variables:
         WHEEL_TYPE: "rust"
 
@@ -376,7 +376,7 @@
         PYTHON: python3.9
     needs:
       - job: trigger-pycompat
-      - job: build-c-wheel-musl
+      - job: build-c-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp39-cp39"
@@ -386,7 +386,7 @@
     image: "$HG_CI_REG/hg-core-test-py39:$HG_CI_IMAGE_TAG"
     needs:
       - trigger-pycompat
-      - job: build-rust-wheel-musl
+      - job: build-rust-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp39-cp39"
@@ -400,7 +400,7 @@
         PYTHON: python3.10
     needs:
       - job: trigger-pycompat
-      - job: build-c-wheel-musl
+      - job: build-c-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp310-cp310"
@@ -410,7 +410,7 @@
     image: "$HG_CI_REG/hg-core-test-py310:$HG_CI_IMAGE_TAG"
     needs:
       - trigger-pycompat
-      - job: build-rust-wheel-musl
+      - job: build-rust-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp310-cp310"
@@ -424,7 +424,7 @@
         PYTHON: python3.11
     needs:
       - job: trigger-pycompat
-      - job: build-c-wheel-musl
+      - job: build-c-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp311-cp311"
@@ -434,7 +434,7 @@
     image: "$HG_CI_REG/hg-core-test-py311:$HG_CI_IMAGE_TAG"
     needs:
       - trigger-pycompat
-      - job: build-rust-wheel-musl
+      - job: build-rust-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp311-cp311"
@@ -448,7 +448,7 @@
         PYTHON: python3.12
     needs:
       - job: trigger-pycompat
-      - job: build-c-wheel-musl
+      - job: build-c-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp312-cp312"
@@ -458,7 +458,7 @@
     image: "$HG_CI_REG/hg-core-test-py312:$HG_CI_IMAGE_TAG"
     needs:
       - trigger-pycompat
-      - job: build-rust-wheel-musl
+      - job: build-rust-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp312-cp312"
@@ -472,7 +472,7 @@
         PYTHON: python3.13
     needs:
       - job: trigger-pycompat
-      - job: build-c-wheel-musl
+      - job: build-c-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp313-cp313"
@@ -482,7 +482,7 @@
     image: "$HG_CI_REG/hg-core-test-py313:$HG_CI_IMAGE_TAG"
     needs:
       - trigger-pycompat
-      - job: build-rust-wheel-musl
+      - job: build-rust-wheel-libc
         parallel:
           matrix:
             - BUILD_PY_ID: "cp313-cp313"