Skip to content

Commit

Permalink
Do not install Ninja on CI services
Browse files Browse the repository at this point in the history
  • Loading branch information
micbou committed Apr 27, 2018
1 parent 07c1860 commit e1b8121
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
7 changes: 3 additions & 4 deletions .circleci/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e1b8121

Please sign in to comment.