Commit 5643cfa0 authored by Michal Čihař's avatar Michal Čihař

Revert "Simplify setup by sharing common settings in global environment"

This reverts commit 1031bcb3.

It really does not work as travis ignores global variables which are
used in matrix as well.
Signed-off-by: default avatarMichal Čihař <michal@cihar.com>
parent cb1ff2fb
......@@ -7,17 +7,14 @@ python:
# - Run Selenium tests on current Django
# - Run pylint/pep8 checker
env:
global:
- TRAVIS_DATABASE=sqlite
- TRAVIS_RUN_TESTS="weblate.trans weblate.lang weblate.accounts"
matrix:
- DJANGO_PIP="Django" DO_LINT=1
- DJANGO_PIP="Django>=1.5,<1.6" TRAVIS_RUN_TESTS="trans lang accounts"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=mysql
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=postgresql
- DJANGO_PIP="Django>=1.6,<1.7"
- DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_RUN_TESTS="weblate.trans.tests.test_selenium" DO_SELENIUM=1
- DJANGO_PIP="Django" TRAVIS_DATABASE=sqlite DO_LINT=1
- DJANGO_PIP="Django>=1.5,<1.6" TRAVIS_DATABASE=sqlite TRAVIS_RUN_TESTS="trans lang accounts"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=mysql TRAVIS_RUN_TESTS="weblate.trans weblate.lang weblate.accounts"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=postgresql TRAVIS_RUN_TESTS="weblate.trans weblate.lang weblate.accounts"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=sqlite TRAVIS_RUN_TESTS="weblate.trans weblate.lang weblate.accounts"
- DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/" TRAVIS_DATABASE=sqlite TRAVIS_RUN_TESTS="weblate.trans weblate.lang weblate.accounts"
- DJANGO_PIP="Django>=1.6,<1.7" TRAVIS_DATABASE=sqlite TRAVIS_RUN_TESTS="weblate.trans.tests.test_selenium" DO_SELENIUM=1
global:
# Sauce labs setup
- secure: "W4EtqCQSbSWb2sDwHd0obttzUTKIPyFZE90qD+YdV76YLgIK7QX4Vc6Hx9fRRNy397h4RrYIzyU2vemGIR5j8cR16Y6MyJ8Fy4DyC2mHyo3T7Tx4/cJYTQDPF2G4kxjR+vmhsdQIdmaYLsjtb2C2M0aIkU8FGFv6D3+TXqsoOmI="
......@@ -53,4 +50,4 @@ after_script:
matrix:
allow_failures:
- python: "2.7"
env: DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/"
env: DJANGO_PIP="https://www.djangoproject.com/download/1.7c2/tarball/" TRAVIS_DATABASE=sqlite TRAVIS_RUN_TESTS="weblate.trans weblate.lang weblate.accounts"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment