Skip to content

Commit dc94432

Browse files
committed
Avoid extra folds in Travis log
1 parent bbac127 commit dc94432

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

travis-ci

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ folded() {
6363
echo -e "\ntravis_fold:end:cppsm.$FOLD\r"
6464
}
6565

66+
folded-finish() {
67+
[ ! -f "$TMP.$1" ] || folded ... finish "$1"
68+
}
69+
6670
folded ... concurrently GIT_UPDATE_PID git submodule update --init --depth 1 --jobs "$N_PARALLEL_UPDATE"
6771

6872
if [ "$TRAVIS_OS_NAME" = linux ]; then
@@ -83,17 +87,17 @@ if ! command -v cppsm > /dev/null; then
8387
export PATH="$PWD/.cppsm/.cli/bin:$PATH"
8488
fi
8589

86-
folded ... finish GIT_UPDATE_PID
90+
folded-finish GIT_UPDATE_PID
8791

8892
for CONFIG in Debug Release; do
8993
if [ "$TRAVIS_OS_NAME" = linux ]; then
90-
folded ... finish LIBSTD_INSTALL_PID
94+
folded-finish LIBSTD_INSTALL_PID
9195
CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
92-
folded ... finish GCC_INSTALL_PID
96+
folded-finish GCC_INSTALL_PID
9397
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-8 CXX=g++-8 folded "GCC $CONFIG" cppsm test
9498
elif [ "$TRAVIS_OS_NAME" = windows ]; then
9599
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' folded "VC2017 $CONFIG" cppsm test
96-
folded ... finish MAKE_INSTALL_PID
100+
folded-finish MAKE_INSTALL_PID
97101
CMAKE_BUILD_TYPE=$CONFIG CC="gcc" CXX="g++" folded "GCC $CONFIG" cppsm test
98102
elif [ "$TRAVIS_OS_NAME" = osx ]; then
99103
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR=Xcode folded "Clang $CONFIG" cppsm test
@@ -105,7 +109,7 @@ for CONFIG in Debug Release; do
105109
done
106110

107111
if [ "$TRAVIS_OS_NAME" = windows ]; then
108-
folded ... finish VC2019_INSTALL_PID
112+
folded-finish VC2019_INSTALL_PID
109113
folded ... choco upgrade -y cmake.install
110114

111115
for CONFIG in Debug Release; do
@@ -134,9 +138,9 @@ format-check() {
134138
}
135139

136140
if [ "$TRAVIS_OS_NAME" = osx ]; then
137-
[ "$CODECOV" != 1 ] || folded ... finish LCOV_INSTALL_PID
141+
[ "$CODECOV" != 1 ] || folded-finish LCOV_INSTALL_PID
138142
[ "$CODECOV" != 1 ] || folded 'Code coverage' code-coverage
139143

140-
[ "$FORMAT_CHECK" = 0 ] || folded ... finish FORMAT_INSTALL_PID
144+
[ "$FORMAT_CHECK" = 0 ] || folded-finish FORMAT_INSTALL_PID
141145
[ "$FORMAT_CHECK" = 0 ] || folded 'Format check' format-check
142146
fi

0 commit comments

Comments
 (0)