From a2f41c7df0986cc7a79a5b6ffcd70ffb78e6e105 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Sat, 18 May 2024 15:24:22 +0200
Subject: Merging debian version 1:10.11.8-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/salsa-ci.yml | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)

(limited to 'debian/salsa-ci.yml')

diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
index ca2c14b1..f699166c 100644
--- a/debian/salsa-ci.yml
+++ b/debian/salsa-ci.yml
@@ -60,7 +60,12 @@ packaging-fix-checks:
   stage: provisioning
   image: debian:sid-slim
   script:
-    - apt-get update -qq && apt-get -qq install --no-install-recommends --yes git devscripts python3-debian shellcheck make lsb-release
+    - apt-get update -qq && apt-get -qq install --no-install-recommends --yes git devscripts python3-debian shellcheck make lsb-release dh-debputy python3-pygls
+    # Check debian/* for typical errors. Don't check spelling as there are too
+    # many false positives and anyway spelling issues are level 'pedantic' in
+    # Debputy and do not emit an exit code, so wouldn't show up as failure in CI
+    # anyway.
+    - debputy lint
     - |
       if [ "$(find debian/patches/ -type f -not -name series | wc -l)" -eq "$(cat debian/patches/series | wc -l)" ]
       then
@@ -74,15 +79,15 @@ packaging-fix-checks:
         exit 1
       fi
     - |
-      wrap-and-sort -a
+      wrap-and-sort -ast
       git checkout debian/tests/control # Revert touching this file, wrap-and-sort shouldn't do it
       if [ "$(git diff --name-only | wc -l)" -eq 0 ]
       then
-        echo "No uncommitted changes after 'wrap-and-sort -av', maintainer has done good job keeping files in order."
+        echo "No uncommitted changes after 'wrap-and-sort -ast', maintainer has done good job keeping files in order."
       else
         git diff
         echo
-        echo "Debian packaging files are unordered! Please run 'wrap-and-sort -av'."
+        echo "Debian packaging files are unordered! Please run 'wrap-and-sort -vast'."
         exit 1
       fi
     # Print syntax errors if found, otherwise continue silently
@@ -99,6 +104,21 @@ packaging-fix-checks:
 
 test-crossbuild-arm64:
   stage: build
+  # Cross-builds allowed to fail by default in Salsa-CI
+
+test-crossbuild-armhf:
+  stage: build
+  extends: .test-crossbuild-package-arm64
+  variables:
+    HOST_ARCH: armhf
+  allow_failure: true  # Cross-builds seem to fail frequently due to unclear reasons
+
+test-crossbuild-armel:
+  stage: build
+  extends: .test-crossbuild-package-arm64
+  variables:
+    HOST_ARCH: armel
+  allow_failure: true  # Cross-builds seem to fail frequently due to unclear reasons
 
 autopkgtest:
   extends: .test-autopkgtest
@@ -142,6 +162,13 @@ blhc:
   curl -sS -O https://snapshot.debian.org/archive/debian/20220507T034236Z/pool/main/o/openssl/libssl1.1_1.1.1o-1_amd64.deb
   apt-get -qq install --no-install-recommends --yes ./libssl1.1_1.1.1o-1_amd64.deb
 
+# Package libaio1 was replaced by libaio1t64 in Debian Sid in April 2024. To
+# continue installing old MariaDB versions that depend on libaio1, use libaio1
+# from snapshots.
+.test-install-libaio-in-sid-for-backwards-compat: &test-install-libaio-in-sid-for-backwards-compat |
+  curl -sS -O https://snapshot.debian.org/archive/debian/20240331T210805Z/pool/main/liba/libaio/libaio1_0.3.113-5_amd64.deb
+  apt-get -qq install --no-install-recommends --yes ./libaio1_0.3.113-5_amd64.deb
+
 .test-verify-initial: &test-verify-initial |
   dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
   # MariaDB until 10.5 only had 'mysql', and since only 'mariadb', so try both
@@ -918,6 +945,7 @@ mariadb.org-10.4 upgrade:
   script:
     - *test-install-readline-in-sid-for-backwards-compat
     - *test-install-openssl1-in-sid-for-backwards-compat
+    - *test-install-libaio-in-sid-for-backwards-compat
     - apt-get install -qq --yes mariadb-server-10.4
     # MariaDB.org version of 10.4 and early 10.5 do not install an init file, so
     # it must be installed here manually
@@ -938,6 +966,7 @@ mariadb.org-10.3 upgrade:
   script:
     - *test-install-readline-in-sid-for-backwards-compat
     - *test-install-openssl1-in-sid-for-backwards-compat
+    - *test-install-libaio-in-sid-for-backwards-compat
     - apt-get install -qq --yes mariadb-server-10.3
     - *test-verify-initial
     - *test-install-all
@@ -958,6 +987,7 @@ mariadb.org-10.2 upgrade:
   script:
     - *test-install-readline-in-sid-for-backwards-compat
     - *test-install-openssl1-in-sid-for-backwards-compat
+    - *test-install-libaio-in-sid-for-backwards-compat
     - apt-get install -qq --yes mariadb-server-10.2
     # Verify initial state before upgrade
     - dpkg -l | grep -iE 'maria|mysql|galera' || true # List installed
-- 
cgit v1.2.3