summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-06-24 15:35:22 +0200
committerErich Eckner <git@eckner.net>2019-06-24 15:35:22 +0200
commitd7b4746ce14b0b448d56acfe51a3be8719113b3e (patch)
tree04a93efcd9f2330b8e874fe61f783a8ce7e9eac9
parentfffb7bc6e29d8a92923d70484b5e17cede736065 (diff)
downloadbuilder-d7b4746ce14b0b448d56acfe51a3be8719113b3e.tar.xz
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
-rwxr-xr-xbin/build-packages21
-rwxr-xr-xconf/slave.conf.example3
-rwxr-xr-xlib/load-configuration3
3 files changed, 14 insertions, 13 deletions
diff --git a/bin/build-packages b/bin/build-packages
index 0428488..185bada 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -404,21 +404,24 @@ while [ "${count}" -ne 0 ] && \
"${base_dir}/bin/ping-to-master" "$$" "${tmp_dir}" &
fi
success=false
+
+ if printf '%s\n' "${package}" | \
+ grep -q '^\(haskell\|python2\?\)-'; then
+ straws_that_might_repair_failing_builds=$(
+ # shellcheck disable=SC2086
+ printf '%s\n' ${straws_that_might_repair_failing_builds} | \
+ sed '
+ s/^\(.*\):haskell_without_check:\(.*\)$/\1:\2\n\1:without_check:\2/
+ '
+ )
+ fi
+
for straw in ${straws_that_might_repair_failing_builds}; do
if ${success}; then
break
fi
- if echo "${straw}" | \
- grep -qF ':haskell_without_check:'; then
- if ! printf '%s\n' "${package}" | \
- grep -q '^\(haskell\|python2\?\)-'; then
- continue
- fi
- straw="${straw}:without_check:"
- fi
-
echo 'preparing' > "${tmp_dir}/.ping-build-master"
outerParameters="-r ${archbuild_chroots}"
diff --git a/conf/slave.conf.example b/conf/slave.conf.example
index 28a7adc..3704e23 100755
--- a/conf/slave.conf.example
+++ b/conf/slave.conf.example
@@ -25,8 +25,7 @@
#straws_that_might_repair_failing_builds=$(
# printf '%s\n' \
# ':mirrored_source:mirrored_source_by_hash:' \
-# ':clean_chroot:' \
-# ':haskell_without_check:' \
+# ':clean_chroot:haskell_without_check:' \
# ':with_build_support:' \
# ':with_build_support:clean_chroot:'
#)
diff --git a/lib/load-configuration b/lib/load-configuration
index 4ad31cf..f327550 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -82,8 +82,7 @@ source_by_hash_mirror='https://sources.archlinux32.org/'
straws_that_might_repair_failing_builds=$(
printf '%s\n' \
':mirrored_source:mirrored_source_by_hash:' \
- ':clean_chroot:' \
- ':haskell_without_check:' \
+ ':clean_chroot:haskell_without_check:' \
':with_build_support:' \
':with_build_support:clean_chroot:'
)