Skip to content

Commit 36594e5

Browse files
committed
No need to install GCC on Linux
1 parent 33fa531 commit 36594e5

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

travis-ci

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ folded-finish() {
6969

7070
folded ... concurrently GIT_UPDATE_PID git submodule update --init --depth 1 --jobs "$N_PARALLEL_UPDATE"
7171

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
7673
[ "$EMSCRIPTEN" != 1 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently EMSCRIPTEN_INSTALL_PID locked brew install emscripten
7774
[ "$CODECOV" != 1 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently LCOV_INSTALL_PID locked brew install lcov
7875
[ "$FORMAT_CHECK" = 0 ] || HOMEBREW_NO_INSTALL_CLEANUP=1 folded ... concurrently FORMAT_INSTALL_PID locked brew install prettier clang-format
@@ -101,9 +98,7 @@ fi
10198
run-tests() {
10299
for CONFIG in Debug Release; do
103100
if [ "$TRAVIS_OS_NAME" = linux ]; then
104-
folded-finish LIBSTD_INSTALL_PID
105101
CMAKE_BUILD_TYPE=$CONFIG CC=clang CXX=clang++ folded "Clang $CONFIG" cppsm test
106-
folded-finish GCC_INSTALL_PID
107102
CMAKE_BUILD_TYPE=$CONFIG CC=gcc-9 CXX=g++-9 folded "GCC $CONFIG" cppsm test
108103
elif [ "$TRAVIS_OS_NAME" = windows ]; then
109104
CMAKE_BUILD_TYPE=$CONFIG CC='' CXX='' CMAKE_GENERATOR="Visual Studio 15 2017" folded "VC2017 $CONFIG" cppsm test

0 commit comments

Comments
 (0)