Browse Source

bin/build-packages: :haskell_without_check: should not skip if it's not a haskell-* package - it should rather append a build trial including straw :without_check: if it is such a package

Erich Eckner 3 months ago
parent
commit
d7b4746ce1
3 changed files with 14 additions and 13 deletions
  1. 12
    9
      bin/build-packages
  2. 1
    2
      conf/slave.conf.example
  3. 1
    2
      lib/load-configuration

+ 12
- 9
bin/build-packages View File

@@ -404,21 +404,24 @@ while [ "${count}" -ne 0 ] && \
404 404
         "${base_dir}/bin/ping-to-master" "$$" "${tmp_dir}" &
405 405
       fi
406 406
       success=false
407
+
408
+      if printf '%s\n' "${package}" | \
409
+        grep -q '^\(haskell\|python2\?\)-'; then
410
+        straws_that_might_repair_failing_builds=$(
411
+          # shellcheck disable=SC2086
412
+          printf '%s\n' ${straws_that_might_repair_failing_builds} | \
413
+            sed '
414
+              s/^\(.*\):haskell_without_check:\(.*\)$/\1:\2\n\1:without_check:\2/
415
+            '
416
+        )
417
+      fi
418
+
407 419
       for straw in ${straws_that_might_repair_failing_builds}; do
408 420
 
409 421
         if ${success}; then
410 422
           break
411 423
         fi
412 424
 
413
-        if echo "${straw}" | \
414
-          grep -qF ':haskell_without_check:'; then
415
-          if ! printf '%s\n' "${package}" | \
416
-            grep -q '^\(haskell\|python2\?\)-'; then
417
-            continue
418
-          fi
419
-          straw="${straw}:without_check:"
420
-        fi
421
-
422 425
         echo 'preparing' > "${tmp_dir}/.ping-build-master"
423 426
 
424 427
         outerParameters="-r ${archbuild_chroots}"

+ 1
- 2
conf/slave.conf.example View File

@@ -25,8 +25,7 @@
25 25
 #straws_that_might_repair_failing_builds=$(
26 26
 #  printf '%s\n' \
27 27
 #    ':mirrored_source:mirrored_source_by_hash:' \
28
-#    ':clean_chroot:' \
29
-#    ':haskell_without_check:' \
28
+#    ':clean_chroot:haskell_without_check:' \
30 29
 #    ':with_build_support:' \
31 30
 #    ':with_build_support:clean_chroot:'
32 31
 #)

+ 1
- 2
lib/load-configuration View File

@@ -82,8 +82,7 @@ source_by_hash_mirror='https://sources.archlinux32.org/'
82 82
 straws_that_might_repair_failing_builds=$(
83 83
   printf '%s\n' \
84 84
     ':mirrored_source:mirrored_source_by_hash:' \
85
-    ':clean_chroot:' \
86
-    ':haskell_without_check:' \
85
+    ':clean_chroot:haskell_without_check:' \
87 86
     ':with_build_support:' \
88 87
     ':with_build_support:clean_chroot:'
89 88
 )