[Pkg-samba-maint] [Git][samba-team/samba][debian_4.16] 4 commits: d/salsa-ci.yml: instead of allowing blhc to (always) fail, disable it

[Michael Tokarev (@mjt)]

Michael Tokarev pushed to branch debian_4.16 at Debian Samba Team / samba


Commits:
d0217119 by Michael Tokarev at 2022-12-16T00:54:36+03:00
d/salsa-ci.yml: instead of allowing blhc to (always) fail, disable it

- - - - -
05fe4dc7 by Michael Tokarev at 2022-12-16T00:54:46+03:00
d/salsa-ci.yml: disable crossbuild-arm64 test (samba does not cross-build)

- - - - -
127aaf81 by Michael Tokarev at 2022-12-16T00:55:04+03:00
d/salsa-ci.yml: reprotest is now fixed

- - - - -
ee3dd2e9 by Michael Tokarev at 2022-12-16T00:55:10+03:00
d/genshlibs: sort shlibs files to make build reproducible

- - - - -


2 changed files:

- debian/genshlibs
- debian/salsa-ci.yml


Changes:

=====================================
debian/genshlibs
=====================================
@@ -71,7 +71,7 @@ for pkg in $(dh_listpackages); do
     esac
     x=${x##*/}
     echo "${x%.so.*} ${x#**.so.} $pkg ($rel)"
-  done > $pd/DEBIAN/shlibs
+  done | LC_ALL=C sort > $pd/DEBIAN/shlibs
 
   # see if we have any public (eg, not in /usr/lib/samba/) libs
   if echo "$libs" | fgrep -qv $smblib/; then


=====================================
debian/salsa-ci.yml
=====================================
@@ -3,10 +3,8 @@ include:
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
   - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
 
-blhc:
+variables:
   # Until https://bugs.debian.org/976175 is fixed in blhc
-  allow_failure: true
-
-reprotest:
-  # Until https://bugs.debian.org/912340 is fixed in samba
-  allow_failure: true
+  SALSA_CI_DISABLE_BLHC: 1
+  # cross-building never worked
+  SALSA_CI_DISABLE_CROSSBUILD_ARM64: 1



View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/c33cabc9ac1c699ea570edd3c1eb3d7105b586ff...ee3dd2e9af84f7963dedbe4658e8eb71885798e7

-- 
View it on GitLab: https://salsa.debian.org/samba-team/samba/-/compare/c33cabc9ac1c699ea570edd3c1eb3d7105b586ff...ee3dd2e9af84f7963dedbe4658e8eb71885798e7
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/pkg-samba-maint/attachments/20221215/1fb61bbb/attachment-0001.htm>