diff options
| -rwxr-xr-x | bin/build-packages | 5 | ||||
| -rwxr-xr-x | bin/return-assignment | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/build-packages b/bin/build-packages index 69c5b56..158e6e1 100755 --- a/bin/build-packages +++ b/bin/build-packages @@ -299,9 +299,12 @@ while [ "${count}" -ne 0 ]; do >&2 printf ' ok.\n' 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 '{}' \; + 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' \) -not -name '*-debug-*' -printf '%f\n' + find . -maxdepth 1 \( -name '*.pkg.tar.xz' -o -name '*.pkg.tar.xz.sig' -o -name '*.build-log.gz' \) -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 6809aff..e1aec3a 100755 --- a/bin/return-assignment +++ b/bin/return-assignment @@ -133,7 +133,7 @@ tar -x \ --no-wildcards-match-slash \ '*.pkg.tar.xz' \ '*.pkg.tar.xz.sig' \ - '*.build-log' + '*.build-log.gz' # check if all packages are signed and all signatures belong to a package signature_errors=$( @@ -182,7 +182,7 @@ if [ -n "${package_errors}" ]; then fi # move build-logs -find . -maxdepth 1 -name '*.build-log' -exec mv '{}' "${build_log_directory}/" \; +find . -maxdepth 1 -name '*.build-log.gz' -exec mv '{}' "${build_log_directory}/$1.$2.$3.$4.{}" \; # move packages destination=$(official_or_community "$1.$2.$3.$4" 'staging') |