[Travis] Use python3.5 instead of default python3.4
Python3.5 add functionnality we need in kiwix-build. And recent versions of meson need python3.5.
This commit is contained in:
parent
2ab9f2679b
commit
681c5b4ec2
10
.travis.yml
10
.travis.yml
|
@ -11,7 +11,7 @@ branches:
|
|||
if: type != push OR tag IS present
|
||||
|
||||
before_install:
|
||||
- PATH=$PATH:${HOME}/bin
|
||||
- PATH=$PATH:${HOME}/bin:${HOME}/.local/bin
|
||||
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=$PATH:$(brew --prefix)/opt/gettext/bin; fi
|
||||
- '[ -n "$encrypted_eba2f7543984_iv" ] && openssl aes-256-cbc
|
||||
-K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv
|
||||
|
@ -40,7 +40,12 @@ script:
|
|||
fi
|
||||
docker run -e PLATFORM -e NIGHTLY_DATE -e TRAVIS_EVENT_TYPE -e TRAVIS_BUILD_DIR -e DESKTOP_ONLY -e TRAVIS_TAG --device /dev/fuse --cap-add ALL --privileged kiwix/build
|
||||
else
|
||||
travis/compile_all.py
|
||||
if [[ $TRAVIS_OS_NAME = "linux" ]]
|
||||
then
|
||||
python3.5 travis/compile_all.py
|
||||
else
|
||||
python3 travis/compile_all.py
|
||||
fi
|
||||
fi
|
||||
after_failure: travis/upload_all_log.sh
|
||||
deploy:
|
||||
|
@ -71,6 +76,7 @@ addons:
|
|||
packages: &common
|
||||
- cmake
|
||||
- autopoint
|
||||
- python3.5
|
||||
- python3-pip
|
||||
- ctpp2-utils
|
||||
- libmagic-dev
|
||||
|
|
|
@ -35,7 +35,7 @@ release_versions = {
|
|||
|
||||
# This is the "version" of the whole base_deps_versions dict.
|
||||
# Change this when you change base_deps_versions.
|
||||
base_deps_meta_version = '13'
|
||||
base_deps_meta_version = '14'
|
||||
|
||||
|
||||
base_deps_versions = {
|
||||
|
|
|
@ -10,9 +10,12 @@ then
|
|||
wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip
|
||||
unzip ninja-mac.zip ninja
|
||||
else
|
||||
pip3 install --user --upgrade pip wheel
|
||||
pip3 install --user pillow
|
||||
pip3 install --user .
|
||||
wget https://bootstrap.pypa.io/get-pip.py
|
||||
python3.5 get-pip.py --user
|
||||
python3.5 -m pip install --user --upgrade pip wheel
|
||||
python3.5 -m pip install --user pillow
|
||||
python3.5 -m pip install --user .
|
||||
python3.5 -m pip show -f kiwix-build
|
||||
|
||||
wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
|
||||
unzip ninja-linux.zip ninja
|
||||
|
|
Loading…
Reference in New Issue