aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorXiretza <xiretza@xiretza.xyz>2021-02-22 15:48:10 +0100
committerGitHub <noreply@github.com>2021-02-22 15:48:10 +0100
commitba23c5a260abe033908677bf92516f1ce934fc41 (patch)
treebb3c0bdb927e262ce6256a2b7817ebd069750e34 /scripts
parent06aedfa2e9fbadccd2927fa0c108f9860ca59742 (diff)
downloadghdl-ba23c5a260abe033908677bf92516f1ce934fc41.tar.gz
ghdl-ba23c5a260abe033908677bf92516f1ce934fc41.tar.bz2
ghdl-ba23c5a260abe033908677bf92516f1ce934fc41.zip
revert "log stderr of make to a file and use tail to show last 1000 lines" (#1660)
This reverts commit 30ee7a32b64c94f1ac0c8e3b5068894b6ea8b556. This workaround masks the return value of `make`, causing runs to appear to fail during install, even though build failed already. Since travis is no longer used for CI, this is unnecessary anyway.
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci-run.sh5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/ci-run.sh b/scripts/ci-run.sh
index d02f7b52e..b0ebfd894 100755
--- a/scripts/ci-run.sh
+++ b/scripts/ci-run.sh
@@ -308,10 +308,7 @@ build () {
#--- make
gstart "[GHDL - build] Make"
- set +e
- make LIB_CFLAGS="$LIB_CFLAGS" OPT_FLAGS="$OPT_FLAGS" -j`nproc` 2>make_err.log
- tail -1000 make_err.log
- set -e
+ make LIB_CFLAGS="$LIB_CFLAGS" OPT_FLAGS="$OPT_FLAGS" -j"$(nproc)"
gend
gstart "[GHDL - build] Install"