From bbdeea69e195ea574751198481d11573debd81eb Mon Sep 17 00:00:00 2001 From: dessant Date: Mon, 12 Dec 2016 06:07:32 +0200 Subject: [PATCH] adjust travis config indentation --- .travis.yml | 64 ++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8bfd94f9..beab8e8e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,20 +30,20 @@ matrix: install: - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then - if [ "${RUN}" != "pep8" ]; then - yes | sudo add-apt-repository ppa:zoogie/sdl2-snapshots; - yes | sudo add-apt-repository ppa:gstreamer-developers/ppa; - sudo apt-get update; - sudo apt-get -y install libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev; - sudo apt-get -y install libgstreamer1.0-dev gstreamer1.0-alsa gstreamer1.0-plugins-base; - sudo apt-get -y install python-dev libsmpeg-dev libswscale-dev libavformat-dev libavcodec-dev libjpeg-dev libtiff4-dev libX11-dev libmtdev-dev; - sudo apt-get -y install python-setuptools build-essential libgl1-mesa-dev libgles2-mesa-dev; - sudo apt-get -y install xvfb pulseaudio; - pip install --upgrade cython pillow nose coveralls; - fi; - if [ "${RUN}" == "docs" ]; then - pip install --upgrade sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-actdiag sphinxcontrib-nwdiag; - fi; + if [ "${RUN}" != "pep8" ]; then + yes | sudo add-apt-repository ppa:zoogie/sdl2-snapshots; + yes | sudo add-apt-repository ppa:gstreamer-developers/ppa; + sudo apt-get update; + sudo apt-get -y install libsdl2-dev libsdl2-ttf-dev libsdl2-image-dev libsdl2-mixer-dev; + sudo apt-get -y install libgstreamer1.0-dev gstreamer1.0-alsa gstreamer1.0-plugins-base; + sudo apt-get -y install python-dev libsmpeg-dev libswscale-dev libavformat-dev libavcodec-dev libjpeg-dev libtiff4-dev libX11-dev libmtdev-dev; + sudo apt-get -y install python-setuptools build-essential libgl1-mesa-dev libgles2-mesa-dev; + sudo apt-get -y install xvfb pulseaudio; + pip install --upgrade cython pillow nose coveralls; + fi; + if [ "${RUN}" == "docs" ]; then + pip install --upgrade sphinxcontrib-blockdiag sphinxcontrib-seqdiag sphinxcontrib-actdiag sphinxcontrib-nwdiag; + fi; fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then curl -O -L https://github.com/tatsuhiro-t/aria2/releases/download/release-1.19.3/aria2-1.19.3-osx-darwin.dmg; @@ -101,28 +101,28 @@ before_script: script: - if [ "${TRAVIS_OS_NAME}" == "linux" ]; then - set -v; - if [ "${RUN}" == "unit" ]; then - make; - make test; - fi; - if [ "${COVERALLS}" == "true" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then - coveralls; - fi; - if [ "${RUN}" == "pep8" ]; then - make style; - fi; - if [ "${RUN}" == "docs" ]; then - make html; - fi; + set -v; + if [ "${RUN}" == "unit" ]; then + make; + make test; + fi; + if [ "${COVERALLS}" == "true" ] && [ "${TRAVIS_BRANCH}" == "master" ]; then + coveralls; + fi; + if [ "${RUN}" == "pep8" ]; then + make style; + fi; + if [ "${RUN}" == "docs" ]; then + make html; + fi; fi; - if [ "${TRAVIS_OS_NAME}" == "osx" ]; then if [ "${PY}" == "3" ]; then - python3 setup.py build_ext --inplace; - python3 -m nose.core kivy/tests; + python3 setup.py build_ext --inplace; + python3 -m nose.core kivy/tests; else - make; - make test; + make; + make test; fi; fi;