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

Auto merge of #2986 - micbou:fix-python2-builds, r=micbou

Browse Source 
[READY] Do not update pip on Travis and CircleCI

Attempt to fix the builds on Travis and CircleCI.

<!-- 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/2986)
<!-- Reviewable:end -->
This commit is contained in:
zzbot 2018-04-16 15:07:42 -07:00 committed by GitHub
commit 2cda39f1cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -22,14 +22,14 @@ aliases:
# Increase the version key to clear the cache. # Increase the version key to clear the cache.
save-cache: &save-cache save-cache: &save-cache
save_cache: save_cache:
key: v1-ycm-{{ .Environment.CIRCLE_JOB }} key: v2-ycm-{{ .Environment.CIRCLE_JOB }}
paths: paths:
- ~/Library/Caches/Homebrew - ~/Library/Caches/Homebrew
- ~/.cache/pip - ~/Library/Caches/pip
- ~/.pyenv - ~/.pyenv
restore-cache: &restore-cache restore-cache: &restore-cache
restore_cache: restore_cache:
key: v1-ycm-{{ .Environment.CIRCLE_JOB }} key: v2-ycm-{{ .Environment.CIRCLE_JOB }}
jobs: jobs:
python2: python2:
<<: *common <<: *common

1
.circleci/install_dependencies.sh
View File

@ -73,7 +73,6 @@ if [ -z \"\${PYENV_LOADING}\" ]; then
unset PYENV_LOADING unset PYENV_LOADING
fi" >> $BASH_ENV fi" >> $BASH_ENV
pip install -U pip wheel setuptools
pip install -r python/test_requirements.txt pip install -r python/test_requirements.txt
set +e set +e

1
ci/travis/travis_install.sh
View File

@ -63,7 +63,6 @@ python_version=$(python -c 'import sys; print( "{0}.{1}".format( sys.version_inf
echo "Checking python version (actual ${python_version} vs expected ${YCM_PYTHON_VERSION})" echo "Checking python version (actual ${python_version} vs expected ${YCM_PYTHON_VERSION})"
test ${python_version} == ${YCM_PYTHON_VERSION} test ${python_version} == ${YCM_PYTHON_VERSION}
pip install -U pip wheel setuptools
pip install -r python/test_requirements.txt pip install -r python/test_requirements.txt
# The build infrastructure prints a lot of spam after this script runs, so make # The build infrastructure prints a lot of spam after this script runs, so make