From 2a1ddc4c1c96b54da3dc0e2e92c40b8317bb3ad6 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Mon, 16 Oct 2017 14:37:08 +0200
Subject: bin/return-assignment, bin/build-packages: return and save build logs
 in case of success, too

---
 bin/build-packages    |  2 +-
 bin/return-assignment | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

(limited to 'bin')

diff --git a/bin/build-packages b/bin/build-packages
index 6b53880..69c5b56 100755
--- a/bin/build-packages
+++ b/bin/build-packages
@@ -301,7 +301,7 @@ while [ "${count}" -ne 0 ]; do
             gpg --local-user="${package_key}" --detach-sign {} \;
           # shellcheck disable=SC2046
           tar -cf 'package.tar' -- $(
-            find . -maxdepth 1 \( -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig' \) -not -name '*-debug-*' -printf '%f\n'
+            find . -maxdepth 1 \( -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig' -o -name '*.build-log' \) -not -name '*-debug-*' -printf '%f\n'
             )
           while ${upload_to_build_master}; do
             err=0
diff --git a/bin/return-assignment b/bin/return-assignment
index e563e31..6809aff 100755
--- a/bin/return-assignment
+++ b/bin/return-assignment
@@ -2,10 +2,10 @@
 
 # report back on a build assignment
 # either on success via:
-#   "$0 $package $revision $mod_revision $repository" and tar'ed packages (= a tar of
-#   package(s) and signature(s)) on stdin
+#   "$0 $package $revision $mod_revision $repository" and tar'ed packages and logs
+#   (= a tar of package(s), signature(s) and log(s)) on stdin
 # or on failure via:
-#   "$0 $package $revision $mod_revision $repository ERROR"
+#   "$0 $package $revision $mod_revision $repository ERROR" and tar'ed logs
 
 # exit codes:
 #  0: ok
@@ -132,7 +132,8 @@ tar -x \
   --wildcards \
   --no-wildcards-match-slash \
   '*.pkg.tar.xz' \
-  '*.pkg.tar.xz.sig'
+  '*.pkg.tar.xz.sig' \
+  '*.build-log'
 
 # check if all packages are signed and all signatures belong to a package
 signature_errors=$(
@@ -180,6 +181,9 @@ if [ -n "${package_errors}" ]; then
   exit 4
 fi
 
+# move build-logs
+find . -maxdepth 1 -name '*.build-log' -exec mv '{}' "${build_log_directory}/" \;
+
 # move packages
 destination=$(official_or_community "$1.$2.$3.$4" 'staging')
 
-- 
cgit v1.2.3-54-g00ecf