wheel: reintroduce the building of i686 wheel stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 15 Nov 2024 16:22:01 +0100
branchstable
changeset 52266 af88f2b9b5b7
parent 52265 a1f2e25b6b38
child 52267 4550c024329d
wheel: reintroduce the building of i686 wheel We now have image to make that work.
Makefile
contrib/packaging/Makefile
--- a/Makefile	Fri Nov 15 07:20:12 2024 +0100
+++ b/Makefile	Fri Nov 15 16:22:01 2024 +0100
@@ -228,6 +228,7 @@
   linux-wheels-x86_64 \
   linux-wheels-x86_64-musl \
   linux-wheels-i686 \
+  linux-wheels-i686-musl \
   ppa
 
 # Forward packaging targets for convenience.
--- a/contrib/packaging/Makefile	Fri Nov 15 07:20:12 2024 +0100
+++ b/contrib/packaging/Makefile	Fri Nov 15 16:22:01 2024 +0100
@@ -127,7 +127,7 @@
 $(foreach release,$(RHEL_RELEASES),$(eval $(call rhel_targets,$(release))))
 
 .PHONY: linux-wheels
-linux-wheels: linux-wheels-x86_64 linux-wheels-x86_64-musl
+linux-wheels: linux-wheels-x86_64 linux-wheels-x86_64-musl linux-wheels-i686 linux-wheels-i686-musl
 
 img_reg="registry.heptapod.net/mercurial/ci-images"
 img_tag="v3.0"
@@ -143,4 +143,8 @@
 
 .PHONY: linux-wheels-i686
 linux-wheels-i686:
-	docker run -e "HGTEST_JOBS=$(shell nproc)" --rm -ti -v `pwd`/../..:/src quay.io/pypa/manylinux1_i686 linux32 /src/contrib/packaging/build-linux-wheels.sh
+	docker run --rm -ti -v `pwd`/../..:/src $(img_reg)/core-wheel-i686-c:$(img_tag) $(whl_sh)
+
+.PHONY: linux-wheels-i686-musl
+linux-wheels-i686-musl:
+	docker run --rm -ti -v `pwd`/../..:/src $(img_reg)/core-wheel-i686-musl-c:$(img_tag) $(whl_sh)