diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-02-19 21:02:51 +0100 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-02-21 19:34:18 +0000 |
| commit | 9a84e6931d64a153b5c6f605d1d2555abf91592d (patch) | |
| tree | b53e66bcd2c9ab82cf9d570fe8247636fb0d1d14 /.travis.yml | |
| parent | 8c300ef4c78e8bd759e0b6f0cabe07cb12c708e3 (diff) | |
Use python3 in Travis for building docs and running clang-tidy
Change-Id: I2f0d72abdf12a4e64b79bf9a3c02b32cf4cbeed6
Reviewed-by: Richard Weickelt <richard@weickelt.de>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 8065c71c6..53af0534b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -95,7 +95,7 @@ jobs: before_install: - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} qtbase qtdeclarative qttools qtscript qtscxml - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator - - pip2 install --user beautifulsoup4 lxml + - pip3 install --user beautifulsoup4 lxml script: - ccache -s - qbs setup-toolchains --detect @@ -125,16 +125,15 @@ jobs: BUILD_OPTIONS="config:release modules.cpp.compilerWrapper:clcache" QMAKE_PATH=${QT_INSTALL_DIR}/${QT_VERSION}/msvc2017_64/bin/qmake.exe PATH="${QT_INSTALL_DIR}/Tools/QtCreator/bin:/c/Python38:/c/Python39:/c/Python38/Scripts:/c/Python39/Scripts:${PATH}" - WITH_DOCS=0 QBS_BUILD_PROFILE=qt CLCACHE_DIR="${HOME}/.ccache" before_install: # Install Qbs and Qt - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QT_VERSION} --toolchain win64_msvc2017_64 qtbase qtdeclarative qttools qtscript - ./scripts/install-qt.sh -d ${QT_INSTALL_DIR} --version ${QTCREATOR_VERSION} qtcreator - - choco install python - - pip install git+https://github.com/frerich/clcache.git@cae73d8255d78db8ba11e23c51fd2c9a89e7475b - - pip install conan + - choco install python3 + - pip3 install git+https://github.com/frerich/clcache.git@cae73d8255d78db8ba11e23c51fd2c9a89e7475b + - pip3 install conan beautifulsoup4 lxml before_script: - clcache -s after_script: |