[med-svn] [Git][med-team/mia][master] 2 commits: Revert "Stop supporting 32bit architectures"

[Yavor Doganov (@yavor-guest)]

Yavor Doganov pushed to branch master at Debian Med / mia


Commits:
f4d5caa7 by Yavor Doganov at 2025-10-21T20:05:48+03:00
Revert "Stop supporting 32bit architectures"

This reverts commit ca5366fb6f10e934d31c5afca5689b53b46eaa97.

- - - - -
0268b860 by Yavor Doganov at 2025-10-22T11:47:35+03:00
Always skip cmdlineparseroutput and 2 additional tests on 32-bit archs.

- - - - -


5 changed files:

- debian/changelog
- debian/control
- debian/rules
- debian/salsa-ci.yml
- debian/tests/testsuite


Changes:

=====================================
debian/changelog
=====================================
@@ -1,4 +1,4 @@
-mia (2.4.7-14) UNRELEASED; urgency=medium
+mia (2.4.7-14) unstable; urgency=medium
 
   [ ikeadeoyin ]
   * Team upload.
@@ -13,14 +13,11 @@ mia (2.4.7-14) UNRELEASED; urgency=medium
   * debian/patches/fix-g++11.diff: Likewise.
   * debian/patches/fix-gcc-13.patch: Likewise.
   * debian/rules: Remove workarounds for mips and mipsel.
-    (DEB_CXXFLAGS_MAINT_APPEND): Define conditionally to reduce the log
-    size for the Salsa CI build only.
     (override_dh_auto_configure): Pass -DCMAKE_POLICY_VERSION_MINIMUM=3.5
     to fix FTBFS with CMake 4 (Closes: #1113285).
-    (override_dh_auto_test): Define conditionally to skip a test which
-    fails only on Salsa CI, probably due to some limitations there.
-  * debian/salsa-ci.yml (build): Forcefully delete .buildinfo/.changes.
-    Change build command to reduce the log and obtain something useful.
+    (override_dh_auto_test-arch): New; always skip a flaky test and two
+    additional tests on 32-bit architectures.
+    (override_dh_auto_test-indep): New dummy target.
   * debian/control (Build-Depends): Require libvtk9-dev (>= 9.5) for the
     ongoing vtk9 library transition.
     (Rules-Requires-Root): Remove; it's the default.
@@ -49,9 +46,8 @@ mia (2.4.7-14) UNRELEASED; urgency=medium
   [ Andreas Tille ]
   * d/copyright: Secure URI in Source field
   * Use default Salsa CI
-  * Stop supporting 32bit architectures
 
- -- Yavor Doganov <yavor at gnu.org>  Mon, 20 Oct 2025 13:19:55 +0300
+ -- Yavor Doganov <yavor at gnu.org>  Wed, 22 Oct 2025 11:46:43 +0300
 
 mia (2.4.7-13) unstable; urgency=medium
 


=====================================
debian/control
=====================================
@@ -5,7 +5,6 @@ Section: science
 Priority: optional
 Build-Depends: cmake,
                debhelper-compat (= 13),
-               architecture-is-64-bit,
                libblas-dev,
                libboost-filesystem-dev,
                libboost-serialization-dev,


=====================================
debian/rules
=====================================
@@ -6,12 +6,6 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -fvisibility=hidden
 export DEB_CPPFLAGS_MAINT_APPEND = -DH5Oget_info_by_name_vers=1 -DH5O_info_t_vers=1
 
-# Reduce log due to size limit on Salsa CI.
-ifdef SALSA_BUILD
-export DEB_CXXFLAGS_MAINT_APPEND = -Wno-deprecated-declarations \
-                                     -Wno-unused-result -Wno-attributes
-endif
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
@@ -39,12 +33,15 @@ override_dh_auto_configure:
 	-DMIA_CREATE_NIPYPE_INTERFACES=OFF \
 	-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=OFF
 
-# Skip a test which fails only on Salsa CI, probably due to some
-# limitations of the environment.
-ifdef SALSA_BUILD
-override_dh_auto_test:
-	dh_auto_test -- ARGS\+="--exclude-regex cmdlineparseroutput"
+override_dh_auto_test-indep: ;
+
+# Always skip a flaky test and another two tests on 32-bit
+# architectures (failing at least on i386).
+ifeq ($(DEB_HOST_ARCH_BITS),32)
+SKIP := |2dimage-cost-lsd|3d-vectorfield
 endif
+override_dh_auto_test-arch:
+	dh_auto_test -- ARGS\+="--exclude-regex \"cmdlineparseroutput$(SKIP)\""
 
 # dh_strip detects executable files, so make *.mia files executable then strip then
 # remove the executable flag


=====================================
debian/salsa-ci.yml
=====================================
@@ -1,6 +1,3 @@
 ---
 include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/recipes/debian.yml
-
-variables:
-  SALSA_CI_DISABLE_BUILD_PACKAGE_I386: 1


=====================================
debian/tests/testsuite
=====================================
@@ -2,4 +2,8 @@
 
 set -e
 
-dh_auto_test
+if [ $(dpkg-architecture --query DEB_HOST_ARCH_BITS) -eq 32 ]; then
+    SKIP="|2dimage-cost-lsd|3d-vectorfield"
+fi
+
+dh_auto_test -- ARGS\+="--exclude-regex \"cmdlineparseroutput${SKIP}\""



View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/ca5366fb6f10e934d31c5afca5689b53b46eaa97...0268b86064cb17f66ea2604d6b553d4ce6c59460

-- 
View it on GitLab: https://salsa.debian.org/med-team/mia/-/compare/ca5366fb6f10e934d31c5afca5689b53b46eaa97...0268b86064cb17f66ea2604d6b553d4ce6c59460
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20251022/a2e8660b/attachment-0001.htm>