File tree Expand file tree Collapse file tree 1 file changed +1
-6
lines changed Expand file tree Collapse file tree 1 file changed +1
-6
lines changed Original file line number Diff line number Diff line change @@ -69,10 +69,7 @@ folded-finish() {
69
69
70
70
folded ... concurrently GIT_UPDATE_PID git submodule update --init --depth 1 --jobs " $N_PARALLEL_UPDATE "
71
71
72
- if [ " $TRAVIS_OS_NAME " = linux ]; then
73
- folded ... concurrently LIBSTD_INSTALL_PID locked bash -c ' sudo -E apt-add-repository -y ppa:ubuntu-toolchain-r/test && sudo -E apt-get -yq update && sudo -E apt-get -yq --no-install-suggests --no-install-recommends install libstdc++-8-dev'
74
- folded ... concurrently GCC_INSTALL_PID locked sudo -E apt-get -yq --no-install-suggests --no-install-recommends install g++-8
75
- elif [ " $TRAVIS_OS_NAME " = osx ]; then
72
+ if [ " $TRAVIS_OS_NAME " = osx ]; then
76
73
[ " $EMSCRIPTEN " != 1 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently EMSCRIPTEN_INSTALL_PID locked brew install emscripten
77
74
[ " $CODECOV " != 1 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently LCOV_INSTALL_PID locked brew install lcov
78
75
[ " $FORMAT_CHECK " = 0 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently FORMAT_INSTALL_PID locked brew install prettier clang-format
101
98
run-tests () {
102
99
for CONFIG in Debug Release; do
103
100
if [ " $TRAVIS_OS_NAME " = linux ]; then
104
- folded-finish LIBSTD_INSTALL_PID
105
101
CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded " Clang $CONFIG " cppsm test
106
- folded-finish GCC_INSTALL_PID
107
102
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-9 CXX=g++-9 folded " GCC $CONFIG " cppsm test
108
103
elif [ " $TRAVIS_OS_NAME " = windows ]; then
109
104
CMAKE_BUILD_TYPE=$CONFIG CC=' ' CXX=' ' CMAKE_GENERATOR=" Visual Studio 15 2017" folded " VC2017 $CONFIG " cppsm test
You can’t perform that action at this time.
0 commit comments