Everything in the test build stage, no other changes

hugovk · Oct 2, 2017 · ecf24e4 · ecf24e4
1 parent 007adc3
commit ecf24e4
Showing 1 changed file with 61 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -29,59 +29,64 @@ matrix:
     - env: DOCKER="fedora-24-amd64"
     - env: DOCKER="fedora-26-amd64"
 
-dist: trusty
-
-sudo: required
-
-services:
-  - docker
-
-install:
-  - if [ "$DOCKER" == "" ]; then .travis/install.sh; fi
-
-before_install:
-  - if [ "$DOCKER" ]; then docker pull pythonpillow/$DOCKER; fi
-
-before_script:
-# Qt needs a display for some of the tests, and it's only run on the system site packages install
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-
-script:
-  - |
-       if [ "$DOCKER" == "" ]; then
-          .travis/script.sh
-       else
-          # the Pillow user in the docker container is UID 1000
-          sudo chown -R 1000 $TRAVIS_BUILD_DIR
-          docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/$DOCKER
-       fi
-
-after_success:
-  - .travis/after_success.sh
-
-after_failure:
-  - |
-      if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-        curl -Lo travis_after_all.py https://raw.github.com/dmakhno/travis_after_all/master/travis_after_all.py
-        python travis_after_all.py
-        export $(cat .to_export_back)
-        if [ "$BUILD_LEADER" = "YES" ]; then
-          if [ "$BUILD_AGGREGATE_STATUS" = "others_failed" ]; then
-            echo "All jobs failed"
-          else
-            echo "Some jobs failed"
-          fi
-        fi
-      fi
-
-after_script:
-  - |
-      if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
-        echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS
-      fi
-
-env:
-  global:
-    # travis encrypt AUTH_TOKEN=
-    secure: "Vzm7aG1Qv0SDQcqiPzZMedNLn5ZmpL7IzF0DYnqcD+/l+zmKU22SnJBcX0uVXumo+r7eZfpsShpqfcdsZvMlvmQnwz+Y6AGKQru9tCKZbTMnuRjWKKXekC+tr8Xt9CKvRVtte5PyXW31paxUI3/e+fQGBwoFjEEC+6EpEOjeRfE="
+
+jobs:
+  include:
+    - stage: test
+
+      dist: trusty
+
+      sudo: required
+
+      services:
+        - docker
+
+      install:
+        - if [ "$DOCKER" == "" ]; then .travis/install.sh; fi
+
+      before_install:
+        - if [ "$DOCKER" ]; then docker pull pythonpillow/$DOCKER; fi
+
+      before_script:
+      # Qt needs a display for some of the tests, and it's only run on the system site packages install
+        - "export DISPLAY=:99.0"
+        - "sh -e /etc/init.d/xvfb start"
+
+      script:
+        - |
+             if [ "$DOCKER" == "" ]; then
+                .travis/script.sh
+             else
+                # the Pillow user in the docker container is UID 1000
+                sudo chown -R 1000 $TRAVIS_BUILD_DIR
+                docker run -v $TRAVIS_BUILD_DIR:/Pillow pythonpillow/$DOCKER
+             fi
+
+      after_success:
+        - .travis/after_success.sh
+
+      after_failure:
+        - |
+            if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+              curl -Lo travis_after_all.py https://raw.github.com/dmakhno/travis_after_all/master/travis_after_all.py
+              python travis_after_all.py
+              export $(cat .to_export_back)
+              if [ "$BUILD_LEADER" = "YES" ]; then
+                if [ "$BUILD_AGGREGATE_STATUS" = "others_failed" ]; then
+                  echo "All jobs failed"
+                else
+                  echo "Some jobs failed"
+                fi
+              fi
+            fi
+
+      after_script:
+        - |
+            if [ "$TRAVIS_REPO_SLUG" = "python-pillow/Pillow" ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
+              echo leader=$BUILD_LEADER status=$BUILD_AGGREGATE_STATUS
+            fi
+
+      env:
+        global:
+          # travis encrypt AUTH_TOKEN=
+          secure: "Vzm7aG1Qv0SDQcqiPzZMedNLn5ZmpL7IzF0DYnqcD+/l+zmKU22SnJBcX0uVXumo+r7eZfpsShpqfcdsZvMlvmQnwz+Y6AGKQru9tCKZbTMnuRjWKKXekC+tr8Xt9CKvRVtte5PyXW31paxUI3/e+fQGBwoFjEEC+6EpEOjeRfE="