travis-ci - set PYTHON=python3 globally
This commit is contained in:
parent
6124b1fae8
commit
3c475ab7da
2 changed files with 3 additions and 2 deletions
|
@ -9,6 +9,7 @@ env:
|
||||||
- CCACHE_TEMPDIR=/tmp/.ccache-temp
|
- CCACHE_TEMPDIR=/tmp/.ccache-temp
|
||||||
- CCACHE_COMPRESS=1
|
- CCACHE_COMPRESS=1
|
||||||
- PREFIX=/tmp/mapnik
|
- PREFIX=/tmp/mapnik
|
||||||
|
- PYTHON=python3
|
||||||
- secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
|
- secure: "F6ivqDNMBQQnrDGA9+7IX+GDswuIqQQd7YPJdQqa2Ked9jddAQDeJClb05ig3JlwfOlYLGZOd43ZX0pKuMtI2Gbkwz211agGP9S3YunwlRg8iWtJlO5kYFUdKCmJNhjg4icfkGELCgwXn+zuEWFSLpkPcjqAFKFlQrIJeAJJgKM="
|
||||||
|
|
||||||
cache:
|
cache:
|
||||||
|
|
|
@ -77,11 +77,11 @@ config_override () {
|
||||||
|
|
||||||
configure () {
|
configure () {
|
||||||
if enabled ${COVERAGE}; then
|
if enabled ${COVERAGE}; then
|
||||||
PYTHON=python3 ./configure "PREFIX=$PREFIX" "CUSTOM_LDFLAGS=$LINKFLAGS" "$@" \
|
./configure "PREFIX=$PREFIX" "CUSTOM_LDFLAGS=$LINKFLAGS" "$@" \
|
||||||
COVERAGE=True DEBUG=True \
|
COVERAGE=True DEBUG=True \
|
||||||
PGSQL2SQLITE=False SVG2PNG=False SVG_RENDERER=False
|
PGSQL2SQLITE=False SVG2PNG=False SVG_RENDERER=False
|
||||||
else
|
else
|
||||||
PYTHON=python3 ./configure "PREFIX=$PREFIX" "CUSTOM_LDFLAGS=$LINKFLAGS" "$@"
|
./configure "PREFIX=$PREFIX" "CUSTOM_LDFLAGS=$LINKFLAGS" "$@"
|
||||||
fi
|
fi
|
||||||
# print final config values, sorted and indented
|
# print final config values, sorted and indented
|
||||||
sort -sk1,1 ./config.py | sed -e 's/^/ /'
|
sort -sk1,1 ./config.py | sed -e 's/^/ /'
|
||||||
|
|
Loading…
Reference in a new issue