smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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:
Matthieu Gautier 2018-07-17 16:55:53 +02:00
parent 2ab9f2679b
commit 681c5b4ec2
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.travis.yml
View File

@ -11,7 +11,7 @@ branches:
if: type != push OR tag IS present if: type != push OR tag IS present
before_install: 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 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then PATH=$PATH:$(brew --prefix)/opt/gettext/bin; fi
- '[ -n "$encrypted_eba2f7543984_iv" ] && openssl aes-256-cbc - '[ -n "$encrypted_eba2f7543984_iv" ] && openssl aes-256-cbc
-K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv -K $encrypted_eba2f7543984_key -iv $encrypted_eba2f7543984_iv
@ -40,7 +40,12 @@ script:
fi 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 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 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 fi
after_failure: travis/upload_all_log.sh after_failure: travis/upload_all_log.sh
deploy: deploy:
@ -71,6 +76,7 @@ addons:
packages: &common packages: &common
- cmake - cmake
- autopoint - autopoint
- python3.5
- python3-pip - python3-pip
- ctpp2-utils - ctpp2-utils
- libmagic-dev - libmagic-dev

2
kiwixbuild/versions.py
View File

@ -35,7 +35,7 @@ release_versions = {
# This is the "version" of the whole base_deps_versions dict. # This is the "version" of the whole base_deps_versions dict.
# Change this when you change base_deps_versions. # Change this when you change base_deps_versions.
base_deps_meta_version = '13' base_deps_meta_version = '14'
base_deps_versions = { base_deps_versions = {

9
travis/install_extra_deps.sh
View File

@ -10,9 +10,12 @@ then
wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-mac.zip
unzip ninja-mac.zip ninja unzip ninja-mac.zip ninja
else else
pip3 install --user --upgrade pip wheel wget https://bootstrap.pypa.io/get-pip.py
pip3 install --user pillow python3.5 get-pip.py --user
pip3 install --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 wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
unzip ninja-linux.zip ninja unzip ninja-linux.zip ninja