Skip to content

Commit dfd62c4

Browse files
committed
Update Travis configuration
1 parent e0f2da0 commit dfd62c4

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

.travis.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -24,19 +24,11 @@ addons:
2424
# The Travis apt source whitelist can be found here:
2525
# https://github.com/travis-ci/apt-source-whitelist/blob/master/ubuntu.json
2626
- ubuntu-toolchain-r-test # for new libstdc++
27-
- deadsnakes # for various versions of python
28-
- kalakris-cmake # for a more recent version of cmake (needed for ninja-build)
27+
- george-edison55-precise-backports # for a more recent version of cmake (3.2.3)
2928
packages:
29+
- cmake-data
3030
- cmake
3131
- ninja-build
32-
# The confusing part is that on Travis Linux with YCMD_PYTHON_VERSION=3.3,
33-
# we build the C++ parts against the below system python3.3, but run
34-
# against the pyenv python3.3. This is because stupid cmake 2.8.11 has a
35-
# bug preventing it from finding the pyenv pythons (ostensibly; I haven't
36-
# checked, but online reports say the issue is gone with cmake 3.4).
37-
# Everything still works though, it's just weird.
38-
- python3.3
39-
- python3.3-dev
4032
# Everything below is a Python build dep (though it depends on Python
4133
# version). We need them because pyenv builds Python.
4234
- libssl-dev

ci/appveyor/appveyor_install.bat

-7
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,6 @@ if %arch% == 32 (
1616
set PATH=%python_path%;%python_path%\Scripts;%PATH%
1717
python --version
1818

19-
:: When using Python 3 on AppVeyor, CMake will always pick the 64 bit
20-
:: libraries. We specifically tell CMake the right path to the libraries
21-
:: according to the architecture.
22-
if %python% == 35 (
23-
set EXTRA_CMAKE_ARGS="-DPYTHON_LIBRARY=%python_path%\libs\python%python%.lib"
24-
)
25-
2619
appveyor DownloadFile https://bootstrap.pypa.io/get-pip.py
2720
python get-pip.py
2821
pip install -r python\test_requirements.txt

ci/travis/travis_install.linux.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1-
# Linux installation
1+
# Linux-specific installation
22

3+
# In order to work with ycmd, python *must* be built as a shared library. This
4+
# is set via the PYTHON_CONFIGURE_OPTS option.
5+
export PYTHON_CONFIGURE_OPTS="--enable-shared"

third_party/ycmd

Submodule ycmd updated from ff72c85 to b74add9

0 commit comments

Comments
 (0)