From c6033d76b833e1c57f1784ece5a99f9739d8d375 Mon Sep 17 00:00:00 2001
From: Paul Zabelin <pzabelin+git@gmail.com>
Date: Sun, 20 Jan 2019 14:13:20 -0800
Subject: [PATCH] nest test stages

---
 .travis.yml | 86 ++++++++++++++++++++++++++---------------------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a58fdda..ef6984b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,50 +37,48 @@ matrix:
         repo: paulz/PerspectiveTransform
         tags: true
   - stage: test
-    name: Check dependencies up-to-date, Lint
-    env: CACHE_NAME=iOS
-    script:
-        - bundle exec pod update --project-directory=Example
-        - git diff --exit-code # Outdated Cocoapods dependencies found, please run 'pod update' and checkin changes
-        - bundle update
-        - git diff --exit-code # Outdated Bundle dependencies found, please run 'bundle update' and checkin changes
-        - bundle exec pod lib lint || bundle exec pod lib lint --verbose --no-clean
-  - stage: test
-    name: With coverage report
-    env: XCODE_DESNITATION='platform=iOS Simulator,name=iPhone X' CACHE_NAME=iOS
-    after_success:
-      - bash <(curl -s 'https://codecov.io/bash') -Z -J '^PerspectiveTransform$' -X gcov -X fix
-  - stage: test
-    name: Mac OS
-    xcode_scheme: OpenCV Tests
-    env: XCODE_DESNITATION='platform=macos' CACHE_NAME=macOS
-    before_script:
-      - yes | pip2 uninstall numpy > /dev/null # Fix Conflict between numpy installed by pip and brew, see https://github.com/travis-ci/travis-ci/issues/6688
-      - for package in opencv xz $(brew deps opencv); do brew link $package || brew install $package; done
-    cache:
-      bundler: true
-      cocoapods: true
-      directories: # Cache opencv with dependecies, list generated by 'brew deps opencv' command minus already installed packages plus opencv and xz
-        - /usr/local/Cellar/opencv
-        - /usr/local/Cellar/eigen
-        - /usr/local/Cellar/ffmpeg
-        - /usr/local/Cellar/gdbm
-        - /usr/local/Cellar/ilmbase
-        - /usr/local/Cellar/jpeg
-        - /usr/local/Cellar/lame
-        - /usr/local/Cellar/libpng
-        - /usr/local/Cellar/libtiff
-        - /usr/local/Cellar/numpy
-        - /usr/local/Cellar/openexr
-        - /usr/local/Cellar/openssl
-        - /usr/local/Cellar/python
-        - /usr/local/Cellar/python3
-        - /usr/local/Cellar/readline
-        - /usr/local/Cellar/sqlite
-        - /usr/local/Cellar/tbb
-        - /usr/local/Cellar/x264
-        - /usr/local/Cellar/xvid
-        - /usr/local/Cellar/xz
+    - name: With coverage report
+      env: XCODE_DESNITATION='platform=iOS Simulator,name=iPhone X' CACHE_NAME=iOS
+      after_success:
+        - bash <(curl -s 'https://codecov.io/bash') -Z -J '^PerspectiveTransform$' -X gcov -X fix
+    - name: Check dependencies up-to-date, Lint
+      env: CACHE_NAME=iOS
+      script:
+          - bundle exec pod update --project-directory=Example
+          - git diff --exit-code # Outdated Cocoapods dependencies found, please run 'pod update' and checkin changes
+          - bundle update
+          - git diff --exit-code # Outdated Bundle dependencies found, please run 'bundle update' and checkin changes
+          - bundle exec pod lib lint || bundle exec pod lib lint --verbose --no-clean
+    - name: Mac OS
+      xcode_scheme: OpenCV Tests
+      env: XCODE_DESNITATION='platform=macos' CACHE_NAME=macOS
+      before_script:
+        - yes | pip2 uninstall numpy > /dev/null # Fix Conflict between numpy installed by pip and brew, see https://github.com/travis-ci/travis-ci/issues/6688
+        - for package in opencv xz $(brew deps opencv); do brew link $package || brew install $package; done
+      cache:
+        bundler: true
+        cocoapods: true
+        directories: # Cache opencv with dependecies, list generated by 'brew deps opencv' command minus already installed packages plus opencv and xz
+          - /usr/local/Cellar/opencv
+          - /usr/local/Cellar/eigen
+          - /usr/local/Cellar/ffmpeg
+          - /usr/local/Cellar/gdbm
+          - /usr/local/Cellar/ilmbase
+          - /usr/local/Cellar/jpeg
+          - /usr/local/Cellar/lame
+          - /usr/local/Cellar/libpng
+          - /usr/local/Cellar/libtiff
+          - /usr/local/Cellar/numpy
+          - /usr/local/Cellar/openexr
+          - /usr/local/Cellar/openssl
+          - /usr/local/Cellar/python
+          - /usr/local/Cellar/python3
+          - /usr/local/Cellar/readline
+          - /usr/local/Cellar/sqlite
+          - /usr/local/Cellar/tbb
+          - /usr/local/Cellar/x264
+          - /usr/local/Cellar/xvid
+          - /usr/local/Cellar/xz
 before_install:
   - bundle -v || gem install bundler
   - ls -la Example/Pods/Manifest.lock && echo Skipping cocoapods repo update || git -C ~/.cocoapods/repos/master/ pull --quiet