diff --git a/common/hooks/do-fetch/00-distfiles.sh b/common/hooks/do-fetch/00-distfiles.sh index 2065d5442a3a12..ff8e21e0688021 100644 --- a/common/hooks/do-fetch/00-distfiles.sh +++ b/common/hooks/do-fetch/00-distfiles.sh @@ -273,7 +273,7 @@ hook() { # If file lock cannot be acquired wait until it's available. while ! flock -w 1 "${distfile}.part" true; do - msg_warn "$pkgver: ${curfile} is already being downloaded, waiting for 1s ...\n" + msg_info "$pkgver: ${curfile} is already being downloaded, waiting for 1s ...\n" done if [[ -f "$distfile" ]]; then diff --git a/common/hooks/do-pkg/00-gen-pkg.sh b/common/hooks/do-pkg/00-gen-pkg.sh index c7b095c4a4e610..cd34980297ebd3 100644 --- a/common/hooks/do-pkg/00-gen-pkg.sh +++ b/common/hooks/do-pkg/00-gen-pkg.sh @@ -14,7 +14,7 @@ genpkg() { [ ! -d $pkgdir ] && mkdir -p $pkgdir while [ -f "$_pkglock" ]; do - msg_warn "${pkgver}: binpkg is being created, waiting for 1s...\n" + msg_info "${pkgver}: binpkg is being created, waiting for 1s...\n" sleep 1 done diff --git a/common/hooks/post-install/03-remove-empty-dirs.sh b/common/hooks/post-install/03-remove-empty-dirs.sh index 06354fc7f5c9c5..f0fb0f4d6ac8a8 100644 --- a/common/hooks/post-install/03-remove-empty-dirs.sh +++ b/common/hooks/post-install/03-remove-empty-dirs.sh @@ -4,7 +4,7 @@ hook() { if [ -d "${PKGDESTDIR}" ]; then find "${PKGDESTDIR}" -mindepth 1 -type d -empty -print -delete|sort -r|while read -r f; do _dir="${f##${PKGDESTDIR}}" - msg_warn "$pkgver: removed empty dir: ${_dir}\n" + msg_info "$pkgver: removed empty dir: ${_dir}\n" done fi } diff --git a/common/hooks/post-install/10-pkglint-devel-paths.sh b/common/hooks/post-install/10-pkglint-devel-paths.sh index ff9e0fc514d05a..7d9225de70f8fc 100644 --- a/common/hooks/post-install/10-pkglint-devel-paths.sh +++ b/common/hooks/post-install/10-pkglint-devel-paths.sh @@ -5,6 +5,13 @@ # - Searches for solinks (.so) and archives (.a) on usr/lib # - Searches for executables in usr/bin that end with -config and a respective manpage +annotate_lint_devel() { + msg_warn "$*\n" + [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ] || return 0 + local _lineno=$(awk '/-devel_package()/ {print FNR; exit}' "${XBPS_SRCPKGDIR}/${sourcepkg}/template") + printf "\n::warning file=srcpkgs/${sourcepkg}/template,line=${_lineno-1},title=$*::$*\n" +} + hook() { local solink archive @@ -19,37 +26,37 @@ hook() { for f in $(find $PKGDESTDIR -type d); do case "${f#$PKGDESTDIR}" in /usr/include) - msg_warn "usr/include should be in -devel package\n" + annotate_lint_devel "usr/include should be in -devel package" ;; /usr/share/pkgconfig) - msg_warn "usr/share/pkgconfig should be in -devel package\n" + annotate_lint_devel "usr/share/pkgconfig should be in -devel package" ;; /usr/lib/pkgconfig) - msg_warn "usr/lib/pkgconfig should be in -devel package\n" + annotate_lint_devel "usr/lib/pkgconfig should be in -devel package" ;; /usr/share/vala) - msg_warn "usr/share/vala should be in -devel package\n" + annotate_lint_devel "usr/share/vala should be in -devel package" ;; /usr/share/gir-1.0) - msg_warn "usr/share/gir-1.0 should be in -devel package\n" + annotate_lint_devel "usr/share/gir-1.0 should be in -devel package" ;; /usr/share/man/man3) - msg_warn "usr/share/man/man3 should be in -devel package\n" + annotate_lint_devel "usr/share/man/man3 should be in -devel package" ;; /usr/share/aclocal) - msg_warn "usr/share/aclocal should be in -devel package\n" + annotate_lint_devel "usr/share/aclocal should be in -devel package" ;; /usr/share/cmake) - msg_warn "usr/share/cmake should be in -devel package\n" + annotate_lint_devel "usr/share/cmake should be in -devel package" ;; /usr/lib/cmake) - msg_warn "usr/lib/cmake should be in -devel package\n" + annotate_lint_devel "usr/lib/cmake should be in -devel package" ;; /usr/share/gtk-doc) - msg_warn "usr/share/gtk-doc should be in -devel package\n" + annotate_lint_devel "usr/share/gtk-doc should be in -devel package" ;; /usr/lib/qt5/mkspecs) - msg_warn "usr/lib/qt5/mkspecs should be in -devel package\n" + annotate_lint_devel "usr/lib/qt5/mkspecs should be in -devel package" ;; esac done @@ -64,21 +71,21 @@ hook() { if [ -d $PKGDESTDIR/usr/bin ]; then for x in $(find $PKGDESTDIR/usr/bin -type f -executable -iname '*-config'); do - msg_warn "${x#$PKGDESTDIR\/} should be in -devel package\n" + annotate_lint_devel "${x#$PKGDESTDIR\/} should be in -devel package" done fi if [ -d $PKGDESTDIR/usr/man/man1 ]; then for m in $(find $PKGDESTDIR/usr/man/man1 -type f -iname '*-config.1'); do - msg_warn "${m#$PKGDESTDIR\/} should be in -devel package\n" + annotate_lint_devel "${m#$PKGDESTDIR\/} should be in -devel package" done fi if [ -n "$solink" ]; then - msg_warn "usr/lib/*.so should be in -devel package\n" + annotate_lint_devel "usr/lib/*.so should be in -devel package" fi if [ -n "$archive" ]; then - msg_warn "usr/lib/*.a should be in -devel package\n" + annotate_lint_devel "usr/lib/*.a should be in -devel package" fi } diff --git a/common/hooks/post-install/12-rename-python3-c-bindings.sh b/common/hooks/post-install/12-rename-python3-c-bindings.sh index c16b69d0139f79..6dc086f30678ae 100644 --- a/common/hooks/post-install/12-rename-python3-c-bindings.sh +++ b/common/hooks/post-install/12-rename-python3-c-bindings.sh @@ -10,7 +10,7 @@ hook() { | while read -r file; do filename="${file##*/}" modulename="${filename%%.*}" - msg_warn "${pkgver}: renamed '${filename}' to '${modulename}.so'.\n" + msg_info "${pkgver}: renamed '${filename}' to '${modulename}.so'.\n" mv ${file} ${file%/*}/${modulename}.so done } diff --git a/common/xbps-src/shutils/common.sh b/common/xbps-src/shutils/common.sh index ca270518a9764d..e8a7267a633fb2 100644 --- a/common/xbps-src/shutils/common.sh +++ b/common/xbps-src/shutils/common.sh @@ -148,6 +148,10 @@ msg_red() { [ -n "$NOCOLORS" ] || printf >&2 "\033[1m\033[31m" printf >&2 "=> ERROR: $@" [ -n "$NOCOLORS" ] || printf >&2 "\033[m" + + if [ "$XBPS_BUILD_ENVIRONMENT" = "void-packages-ci" ]; then + printf "\n::error::$@" + fi } msg_red_nochroot() { @@ -174,6 +178,13 @@ msg_warn_nochroot() { [ -n "$NOCOLORS" ] || printf >&2 "\033[m" } +msg_info() { + # info messages in bright bold white + [ -n "$NOCOLORS" ] || printf "\033[97m\033[1m" + printf >&2 "=> INFO: $@" + [ -n "$NOCOLORS" ] || printf >&2 "\033[m" +} + msg_normal() { if [ -z "$XBPS_QUIET" ]; then # normal messages in bright bold white diff --git a/srcpkgs/zlib/template b/srcpkgs/zlib/template index d9b3bdf11389aa..28efbad79eb3cd 100644 --- a/srcpkgs/zlib/template +++ b/srcpkgs/zlib/template @@ -1,7 +1,7 @@ # Template file for 'zlib' pkgname=zlib version=1.3.2 -revision=1 +revision=2 bootstrap=yes build_style=configure configure_args="--prefix=/usr --shared" @@ -18,7 +18,6 @@ zlib-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove usr/lib/pkgconfig vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/share