From 75e764326756335ce9f391e3eb2c27de1543a946 Mon Sep 17 00:00:00 2001
From: sfalexrog <sfalexrog@gmail.com>
Date: Mon, 15 Jul 2019 13:52:16 +0300
Subject: [PATCH] travis: oh god how did that .travis.yml even work

---
 .travis.yml | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 675b909a1575..f72045a2d6af 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,28 +13,29 @@ git:
 
 cache:
   ccache: true
-matrix:
-  fast_finish: true
-  include:
-    - os: linux
-      dist: xenial
-      if: branch = coverity_scan
 
 before_install:
-    - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+  - echo -n | openssl s_client -connect scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca-
+  # use git:// to fetch instead of https://
+  - git config --global url."git://".insteadOf https://
 
 env:
 # FIXME: px4_fmu-v2_default is too large
 # - BUILD_TARGET=px4_fmu-v2_default
- - BUILD_TARGET=px4_fmu-v2_lpe
- - BUILD_TARGET=px4_fmu-v3_default
- - BUILD_TARGET=px4_fmu-v4_default
- - BUILD_TARGET=px4_fmu-v5_default
+  - BUILD_TARGET=px4_fmu-v2_lpe
+  - BUILD_TARGET=px4_fmu-v3_default
+  - BUILD_TARGET=px4_fmu-v4_default
+  - BUILD_TARGET=px4_fmu-v5_default
 
 stage: Build
 
+install:
+  - export PATH=$HOME/.local/bin:$PATH
+  - pip install --user --upgrade pip
+  - pip install --user -r Tools/setup/requirements.txt
+
 script:
- - ./Tools/docker_run.sh make ${BUILD_TARGET}
+  - ./Tools/docker_run.sh make ${BUILD_TARGET}
 
 jobs:
   include:
@@ -85,12 +86,4 @@ deploy:
 #     build_command_prepend: "make distclean"
 #     build_command: "make px4_sitl_default"
 #     branch_pattern: coverity_scan
-install:
-    - export PATH=$HOME/.local/bin:$PATH
-    - pip install --user --upgrade pip
-    - pip install --user -r Tools/setup/requirements.txt
-
-script:
-    - make
-