From c31b0de18b067a141cd8c2b18a90cfbc6cbf78e5 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 19 Oct 2017 09:54:05 +0200 Subject: bin/build-packages, bin/return-assignment: upload namcap.log (instead of build-log) for successful builds, insist on namcap.log for uploaded packages --- bin/build-packages | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'bin/build-packages') diff --git a/bin/build-packages b/bin/build-packages index a78225e..21a862b 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -300,13 +300,13 @@ while [ "${count}" -ne 0 ]; do find . -maxdepth 1 -type f -name '*.pkg.tar.xz' -exec \ gpg --local-user="${package_key}" --detach-sign {} \; if ${upload_to_build_master}; then - find . -maxdepth 1 -name '*.build-log' -execdir gzip '{}' \; + find . -maxdepth 1 -name '*.pkg.tar.xz-namcap.log' -execdir gzip '{}' \; else - find . -maxdepth 1 -name '*.build-log' -execdir grep -HF '' '{}' \; + find . -maxdepth 1 -name '*.pkg.tar.xz-namcap.log' -execdir grep -HF '' '{}' \; fi # shellcheck disable=SC2046 tar -cf 'package.tar' -- $( - find . -maxdepth 1 \( -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig' -o -name '*.build-log.gz' \) -not -name '*-debug-*' -printf '%f\n' + find . -maxdepth 1 \( -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig' -o -name '*.pkg.tar.xz-namcap.log.gz' \) -not -name '*-debug-*' -printf '%f\n' ) while ${upload_to_build_master}; do err=0 -- cgit v1.2.3-54-g00ecf