diff --git a/.github/workflows/yml-uses-create-addon-LE10.yml b/.github/workflows/yml-uses-create-addon-LE10.yml index 97543fa..f1299a9 100644 --- a/.github/workflows/yml-uses-create-addon-LE10.yml +++ b/.github/workflows/yml-uses-create-addon-LE10.yml @@ -171,7 +171,7 @@ jobs: -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ -e ADDON_JENKINS=yes \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -250,7 +250,13 @@ jobs: if echo "${logtail}" | grep -qE "^FAILED:|command not found"; then reason="BUILD" else - reason=$(echo "${logtail}" | grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi fi if [ -z "${reason}" ]; then reason=$(echo "${logtail}" | grep -oE "cannot stat '[^']+'" | tail -1 | sed "s|cannot stat '||;s|.*/||;s|'||") diff --git a/.github/workflows/yml-uses-create-addon-LE11.yml b/.github/workflows/yml-uses-create-addon-LE11.yml index 223ea71..d098694 100644 --- a/.github/workflows/yml-uses-create-addon-LE11.yml +++ b/.github/workflows/yml-uses-create-addon-LE11.yml @@ -171,7 +171,7 @@ jobs: -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ -e ADDON_JENKINS=yes \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -250,7 +250,13 @@ jobs: if echo "${logtail}" | grep -qE "^FAILED:|command not found"; then reason="BUILD" else - reason=$(echo "${logtail}" | grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi fi if [ -z "${reason}" ]; then reason=$(echo "${logtail}" | grep -oE "cannot stat '[^']+'" | tail -1 | sed "s|cannot stat '||;s|.*/||;s|'||") diff --git a/.github/workflows/yml-uses-create-addon-LE12-2.yml b/.github/workflows/yml-uses-create-addon-LE12-2.yml index 6f17e77..e52511f 100644 --- a/.github/workflows/yml-uses-create-addon-LE12-2.yml +++ b/.github/workflows/yml-uses-create-addon-LE12-2.yml @@ -169,7 +169,7 @@ jobs: -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ -e ADDON_JENKINS=yes \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -248,7 +248,13 @@ jobs: if echo "${logtail}" | grep -qE "^FAILED:|command not found"; then reason="BUILD" else - reason=$(echo "${logtail}" | grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi fi if [ -z "${reason}" ]; then reason=$(echo "${logtail}" | grep -oE "cannot stat '[^']+'" | tail -1 | sed "s|cannot stat '||;s|.*/||;s|'||") diff --git a/.github/workflows/yml-uses-create-addon-LE12.yml b/.github/workflows/yml-uses-create-addon-LE12.yml index e30f1b3..a3684c0 100644 --- a/.github/workflows/yml-uses-create-addon-LE12.yml +++ b/.github/workflows/yml-uses-create-addon-LE12.yml @@ -171,7 +171,7 @@ jobs: -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ -e ADDON_JENKINS=yes \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -250,7 +250,13 @@ jobs: if echo "${logtail}" | grep -qE "^FAILED:|command not found"; then reason="BUILD" else - reason=$(echo "${logtail}" | grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi fi if [ -z "${reason}" ]; then reason=$(echo "${logtail}" | grep -oE "cannot stat '[^']+'" | tail -1 | sed "s|cannot stat '||;s|.*/||;s|'||") diff --git a/.github/workflows/yml-uses-create-addon-LE13.yml b/.github/workflows/yml-uses-create-addon-LE13.yml index 05131ff..8e1a93f 100644 --- a/.github/workflows/yml-uses-create-addon-LE13.yml +++ b/.github/workflows/yml-uses-create-addon-LE13.yml @@ -169,7 +169,7 @@ jobs: -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ -e ADDON_JENKINS=yes \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -248,7 +248,13 @@ jobs: if echo "${logtail}" | grep -qE "^FAILED:|command not found"; then reason="BUILD" else - reason=$(echo "${logtail}" | grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi fi if [ -z "${reason}" ]; then reason=$(echo "${logtail}" | grep -oE "cannot stat '[^']+'" | tail -1 | sed "s|cannot stat '||;s|.*/||;s|'||") diff --git a/.github/workflows/yml-uses-make-image-LE10.yml b/.github/workflows/yml-uses-make-image-LE10.yml index a9c9737..d4a6750 100644 --- a/.github/workflows/yml-uses-make-image-LE10.yml +++ b/.github/workflows/yml-uses-make-image-LE10.yml @@ -181,7 +181,7 @@ jobs: -e PROJECT=${{ env.PROJECT }} \ -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -256,7 +256,13 @@ jobs: logfile="${artifactdir}/${{ env.TARGETBUILDDIR }}-${pkgsafe}-$(basename "${logpath}")" text+="step [${step}/${total}] ${pkg}\n" if [ -f "${logfile}" ]; then - reason=$(grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi [ -n "${reason}" ] && text+="reason for failure - ${reason}\n" fi done <<< "${failed_lines}" diff --git a/.github/workflows/yml-uses-make-image-LE11.yml b/.github/workflows/yml-uses-make-image-LE11.yml index 61a0e8d..7e831d2 100644 --- a/.github/workflows/yml-uses-make-image-LE11.yml +++ b/.github/workflows/yml-uses-make-image-LE11.yml @@ -181,7 +181,7 @@ jobs: -e PROJECT=${{ env.PROJECT }} \ -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -256,7 +256,13 @@ jobs: logfile="${artifactdir}/${{ env.TARGETBUILDDIR }}-${pkgsafe}-$(basename "${logpath}")" text+="step [${step}/${total}] ${pkg}\n" if [ -f "${logfile}" ]; then - reason=$(grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi [ -n "${reason}" ] && text+="reason for failure - ${reason}\n" fi done <<< "${failed_lines}" diff --git a/.github/workflows/yml-uses-make-image-LE12-2.yml b/.github/workflows/yml-uses-make-image-LE12-2.yml index 419575f..9402d93 100644 --- a/.github/workflows/yml-uses-make-image-LE12-2.yml +++ b/.github/workflows/yml-uses-make-image-LE12-2.yml @@ -182,7 +182,7 @@ jobs: -e PROJECT=${{ env.PROJECT }} \ -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -257,7 +257,13 @@ jobs: logfile="${artifactdir}/${{ env.TARGETBUILDDIR }}-${pkgsafe}-$(basename "${logpath}")" text+="step [${step}/${total}] ${pkg}\n" if [ -f "${logfile}" ]; then - reason=$(grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi [ -n "${reason}" ] && text+="reason for failure - ${reason}\n" fi done <<< "${failed_lines}" diff --git a/.github/workflows/yml-uses-make-image-LE12.yml b/.github/workflows/yml-uses-make-image-LE12.yml index 01adfa2..d7ac642 100644 --- a/.github/workflows/yml-uses-make-image-LE12.yml +++ b/.github/workflows/yml-uses-make-image-LE12.yml @@ -183,7 +183,7 @@ jobs: -e PROJECT=${{ env.PROJECT }} \ -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -258,7 +258,13 @@ jobs: logfile="${artifactdir}/${{ env.TARGETBUILDDIR }}-${pkgsafe}-$(basename "${logpath}")" text+="step [${step}/${total}] ${pkg}\n" if [ -f "${logfile}" ]; then - reason=$(grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi [ -n "${reason}" ] && text+="reason for failure - ${reason}\n" fi done <<< "${failed_lines}" diff --git a/.github/workflows/yml-uses-make-image-LE13.yml b/.github/workflows/yml-uses-make-image-LE13.yml index 1a9a8c7..36ce4cb 100644 --- a/.github/workflows/yml-uses-make-image-LE13.yml +++ b/.github/workflows/yml-uses-make-image-LE13.yml @@ -182,7 +182,7 @@ jobs: -e PROJECT=${{ env.PROJECT }} \ -e ARCH=${{ env.ARCH }} \ -e DEVICE=${{ env.DEVICE }} \ - -e ONELOG=no -e LOGCOMBINE=fail \ + -e ONELOG=no -e LOGCOMBINE=fail -e DISABLE_COLORS=yes \ -e BUILD_DIR=${{ env.build_dir }} \ -e BUILD_PERIODIC=${{ env.BUILD_PERIODIC }} \ -e CCACHE_DISABLE=${{ env.CCACHE_DISABLE }} \ @@ -257,7 +257,13 @@ jobs: logfile="${artifactdir}/${{ env.TARGETBUILDDIR }}-${pkgsafe}-$(basename "${logpath}")" text+="step [${step}/${total}] ${pkg}\n" if [ -f "${logfile}" ]; then - reason=$(grep -ohE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + op=$(grep -oE "APPLY PATCH|CONFIGURE|CMAKE|UNPACK" "${logfile}" | tail -1) + subpkg=$(grep -oE "UNPACK[[:space:]]+[^[:space:]]+" "${logfile}" | tail -1 | awk '{ print $2 }') + reason="${op}${subpkg:+ ${subpkg}}" + if [ "${op}" = "APPLY PATCH" ]; then + patch=$(grep "APPLY PATCH" "${logfile}" | tail -1 | awk '{ print $NF }') + reason="${reason}${patch:+ (${patch})}" + fi [ -n "${reason}" ] && text+="reason for failure - ${reason}\n" fi done <<< "${failed_lines}"