Auto merge of #3004 - micbou:remove-ninja-ci, r=micbou
[READY] Do not install Ninja on CI services See PR https://github.com/Valloric/ycmd/pull/955. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/valloric/youcompleteme/3004) <!-- Reviewable:end -->
This commit is contained in:
commit
2857c1c109
@ -12,16 +12,15 @@ set -e
|
||||
brew update || brew update
|
||||
|
||||
# List of homebrew formulae to install in the order they appear.
|
||||
# We require CMake and Ninja for our build and tests, and all the others are
|
||||
# dependencies of pyenv.
|
||||
# We require CMake for our build and tests, and all the others are dependencies
|
||||
# of pyenv.
|
||||
REQUIREMENTS="cmake
|
||||
ninja
|
||||
readline
|
||||
autoconf
|
||||
pkg-config
|
||||
openssl"
|
||||
|
||||
# Install CMake, Ninja, and pyenv dependencies.
|
||||
# Install CMake and pyenv dependencies.
|
||||
for pkg in $REQUIREMENTS; do
|
||||
# Install package, or upgrade it if it is already installed.
|
||||
brew install $pkg || brew outdated $pkg || brew upgrade $pkg
|
||||
|
@ -29,7 +29,6 @@ addons:
|
||||
# 4.8 is the first version of GCC with good enough C++11 support to build
|
||||
# ycmd.
|
||||
- g++-4.8
|
||||
- ninja-build
|
||||
# Everything below is a Python build dep (though it depends on Python
|
||||
# version). We need them because pyenv builds Python.
|
||||
- libssl-dev
|
||||
|
Loading…
Reference in New Issue
Block a user