vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Auto merge of #3004 - micbou:remove-ninja-ci, r=micbou

Browse Source 
[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:
zzbot 2018-04-30 14:53:12 -07:00 committed by GitHub
commit 2857c1c109
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.circleci/install_dependencies.sh
View File

@ -12,16 +12,15 @@ set -e
brew update || brew update brew update || brew update
# List of homebrew formulae to install in the order they appear. # 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 # We require CMake for our build and tests, and all the others are dependencies
# dependencies of pyenv. # of pyenv.
REQUIREMENTS="cmake REQUIREMENTS="cmake
ninja
readline readline
autoconf autoconf
pkg-config pkg-config
openssl" openssl"
# Install CMake, Ninja, and pyenv dependencies. # Install CMake and pyenv dependencies.
for pkg in $REQUIREMENTS; do for pkg in $REQUIREMENTS; do
# Install package, or upgrade it if it is already installed. # Install package, or upgrade it if it is already installed.
brew install $pkg || brew outdated $pkg || brew upgrade $pkg brew install $pkg || brew outdated $pkg || brew upgrade $pkg

1
.travis.yml
View File

@ -29,7 +29,6 @@ addons:
# 4.8 is the first version of GCC with good enough C++11 support to build # 4.8 is the first version of GCC with good enough C++11 support to build
# ycmd. # ycmd.
- g++-4.8 - g++-4.8
- ninja-build
# Everything below is a Python build dep (though it depends on Python # Everything below is a Python build dep (though it depends on Python
# version). We need them because pyenv builds Python. # version). We need them because pyenv builds Python.
- libssl-dev - libssl-dev