Skip to content

Commit 7bf4777

Browse files
committed
fix ci before_install bug
1 parent df468fc commit 7bf4777

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

.travis.yml

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,18 @@ os:
77
- osx
88

99
before_install:
10-
- sudo add-apt-repository --yes ppa:kalakris/cmake
11-
- sudo apt-get update -qq
12-
- sudo apt-get install cmake
10+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:kalakris/cmake && sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi
11+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo add-apt-repository --yes ppa:bcandrea/backports; fi
12+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
13+
14+
install:
15+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y cmake gcc-4.8 g++-4.8 clang golang; fi
16+
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then export CXX="g++-4.8" CC="gcc-4.8" GOROOT="/usr/lib/go" GOPATH=$HOME/gocode PATH=$PATH:$GOPATH/bin; fi
1317

14-
addons:
15-
apt:
16-
sources:
17-
- ubuntu-toolchain-r-test
18-
packages:
19-
- gcc-5
20-
- g++-5
21-
- clang
2218

2319
compiler:
2420
- gcc
2521

2622
script:
27-
- cmake --version
2823
- ./install.sh
2924
- sudo vim +PluginClean +qall

0 commit comments

Comments
 (0)