CI: Lose the output folding props.
authorDenis Ovsienko <denis@ovsienko.info>
Mon, 5 Jul 2021 01:04:51 +0000 (02:04 +0100)
committerDenis Ovsienko <denis@ovsienko.info>
Mon, 5 Jul 2021 01:04:51 +0000 (02:04 +0100)
Same as in libpcap.

build.sh
build_matrix.sh

index 36ef7c9ba09772e62a536e39d11c85f3e47d8798..3eb565eebbe861ccee6cca38364efe48b6c62d62 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -15,14 +15,6 @@ if [ -z "$PREFIX" ]; then
     DELETE_PREFIX=yes
 fi
 
-travis_fold() {
-    tf_action=${1:?}
-    tf_name=${2:?}
-    if [ "$TRAVIS" != true ]; then return; fi
-    printf 'travis_fold:%s:%s.script.%s\r' "$tf_action" "$LABEL" "$tf_name"
-    sleep 1
-}
-
 # Run a command after displaying it
 run_after_echo() {
     printf '$ '
@@ -31,36 +23,24 @@ run_after_echo() {
     $@
 }
 
-# LABEL is needed to build the travis fold labels
-LABEL="$CC"
 echo '$ ./configure [...]'
-travis_fold start configure
 ./configure --prefix="$PREFIX"
-travis_fold end configure
 run_after_echo "make -s clean"
 run_after_echo "make"
 run_after_echo "./tcpslice -h"
 echo '$ make install'
-travis_fold start make_install
 make install
-travis_fold end make_install
 system=$(uname -s)
 if [ "$system" = Darwin ] || [ "$system" = Linux ]; then
     run_after_echo "make releasetar"
 fi
-if [ "$TRAVIS" = true ]; then
+if [ "$MATRIX_DEBUG" = true ]; then
     echo '$ cat Makefile [...]'
-    travis_fold start cat_makefile
     sed '/^# DO NOT DELETE THIS LINE -- mkdep uses it.$/q' < Makefile
-    travis_fold end cat_makefile
     echo '$ cat config.h'
-    travis_fold start cat_config_h
     cat config.h
-    travis_fold end cat_config_h
     echo '$ cat config.log'
-    travis_fold start cat_config_log
     cat config.log
-    travis_fold end cat_config_log
 fi
 if [ "$DELETE_PREFIX" = yes ]; then
     rm -rf "$PREFIX"
index a8e2d4f938870822aa87cb6f73f283bc6521c67c..c948ede7b7b9d3d3f11292a4143e1fb4532f5e36 100755 (executable)
@@ -16,14 +16,6 @@ if [ -z "$PREFIX" ]; then
 fi
 COUNT=0
 
-travis_fold() {
-    tf_action=${1:?}
-    tf_name=${2:?}
-    if [ "$TRAVIS" != true ]; then return; fi
-    printf 'travis_fold:%s:%s.script.%s\r' "$tf_action" "$LABEL" "$tf_name"
-    sleep 1
-}
-
 # Display text in magenta
 echo_magenta() {
     printf '\033[35;1m' # ANSI magenta
@@ -52,18 +44,14 @@ for CC in ${MATRIX_CC:-gcc clang}; do
                 make -C ../libpcap distclean || :
             fi
         fi
-        # LABEL is needed to build the travis fold labels
-        LABEL="$CC.$BUILD_LIBPCAP"
         # Run one build with the setup environment variable: CC
         ./build.sh
         echo 'Cleaning...'
-        travis_fold start cleaning
         make distclean
         rm -rf "${PREFIX:?}"/*
         git status -suall
         # Cancel changes in configure
         git checkout configure
-        travis_fold end cleaning
     done
 done
 rm -rf "$PREFIX"