[PATCH] ci: do not dump error logs in GHA containers

[David Marchand]

On error, the build logs are displayed in GHA console and logs unless
the GITHUB_WORKFLOW env variable is set.
However, containers in GHA do not automatically inherit this variable.
We could pass this variable in the container environment, but in the
end, dumping those logs is only for Travis which we don't really care
about anymore.

Let's make the linux-build.sh more generic and dump logs from Travis
yaml itself.

Fixes: b35c4b0aa2bc ("ci: add Fedora 35 container in GHA")

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 .ci/linux-build.sh | 19 -------------------
 .travis.yml        |  4 ++++
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 774a1441bf..6a937611fa 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -3,25 +3,6 @@
 # Builds are run as root in containers, no need for sudo
 [ "$(id -u)" != '0' ] || alias sudo=
 
-on_error() {
-    if [ $? = 0 ]; then
-        exit
-    fi
-    FILES_TO_PRINT="build/meson-logs/testlog.txt"
-    FILES_TO_PRINT="$FILES_TO_PRINT build/.ninja_log"
-    FILES_TO_PRINT="$FILES_TO_PRINT build/meson-logs/meson-log.txt"
-    FILES_TO_PRINT="$FILES_TO_PRINT build/gdb.log"
-
-    for pr_file in $FILES_TO_PRINT; do
-        if [ -e "$pr_file" ]; then
-            cat "$pr_file"
-        fi
-    done
-}
-# We capture the error logs as artifacts in Github Actions, no need to dump
-# them via a EXIT handler.
-[ -n "$GITHUB_WORKFLOW" ] || trap on_error EXIT
-
 install_libabigail() {
     version=$1
     instdir=$2
diff --git a/.travis.yml b/.travis.yml
index 5f46dccb54..e4e70fa560 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,6 +38,10 @@ _doc_packages: &doc_packages
 
 before_install: ./.ci/${TRAVIS_OS_NAME}-setup.sh
 script: ./.ci/${TRAVIS_OS_NAME}-build.sh
+after_failure:
+- [ ! -e build/meson-logs/testlog.txt ] || cat build/meson-logs/testlog.txt
+- [ ! -e build/.ninja_log ] || cat build/.ninja_log
+- [ ! -e build/meson-logs/meson-log.txt ] || cat build/meson-logs/meson-log.txt
 
 env:
   global:
-- 
2.23.0