From c83c098bc5afe812a2180cd344387a760491ef85 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Wed, 1 Jan 2020 04:00:07 -0500
Subject: [PATCH 1/3] Use Codecov.io for coverage reporting

---
 .travis.yml | 45 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1034042d9..f4cb329bd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ addons:
     - qtmultimedia5-dev
     - doxygen
     - graphviz
+    - curl
     packages: &ff_common  # Common set of FFmpeg packages
     - *p_common
     - libfdk-aac-dev
@@ -34,7 +35,10 @@ addons:
 matrix:
   include:
     - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
-      env: BUILD_VERSION=ffmpeg2
+      env:
+        - BUILD_VERSION=ffmpeg2
+        - CMAKE_EXTRA_ARGS=""
+        - TEST_TARGET="os_test"
       os: linux
       dist: xenial
       addons:
@@ -46,7 +50,10 @@ matrix:
           - *ff_common
 
     - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
-      env: BUILD_VERSION=ffmpeg3
+      env:
+        - BUILD_VERSION=ffmpeg3
+        - CMAKE_EXTRA_ARGS=""
+        - TEST_TARGET=test
       os: linux
       dist: bionic
       addons:
@@ -59,7 +66,10 @@ matrix:
           - qt5-default
 
     - name: "FFmpeg 4 GCC (Ubuntu 18.04 Bionic)"
-      env: BUILD_VERSION=ffmpeg4
+      env:
+        - BUILD_VERSION=ffmpeg4
+        - CMAKE_EXTRA_ARGS=""
+        - TEST_TARGET=test
       os: linux
       dist: bionic
       addons:
@@ -82,7 +92,10 @@ matrix:
           - libswresample3
 
     - name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)"
-      env: BUILD_VERSION=ffmpeg3
+      env:
+        - BUILD_VERSION=clang_ffmpeg3
+        - CMAKE_EXTRA_ARGS=""
+        - TEST_TARGET=test
       os: linux
       dist: bionic
       compiler: clang
@@ -96,9 +109,31 @@ matrix:
           - qt5-default
           - libomp-dev
 
+    - name: "Coverage (Ubuntu 18.04 Bionic)"
+      env:
+        - BUILD_VERSION=coverage_ffmpeg3
+        - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1"
+        - TEST_TARGET=coverage
+      os: linux
+      dist: bionic
+      addons:
+        apt:
+          sources:
+          - sourceline: 'ppa:openshot.developers/libopenshot-daily'
+          - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
+          packages:
+          - *ff_common
+          - qt5-default
+          - lcov
+          - binutils-common # For c++filt
+
 script:
   - mkdir -p build; cd build;
   - cmake -DCMAKE_BUILD_TYPE:STRING="Debug" ../
   - make VERBOSE=1
-  - make os_test
+  - make ${TEST_TARGET}
   - make install DESTDIR="$BUILD_VERSION"
+  - cd ..
+
+after_success:
+  - if [ "x$TEST_TARGET" = "xcoverage" ]; then bash <(curl -s https://codecov.io/bash) -f build/coverage.info || echo "Codecov did not collect coverage reports"; fi

From 6d95bcef12c22f4ef73dd7cf87916c0da0c99780 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Sun, 12 Jan 2020 08:47:08 -0500
Subject: [PATCH 2/3] Configuration for Codecov

---
 codecov.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 codecov.yml

diff --git a/codecov.yml b/codecov.yml
new file mode 100644
index 000000000..dfdc93755
--- /dev/null
+++ b/codecov.yml
@@ -0,0 +1,15 @@
+codecov:
+  branch: default
+coverage:
+  status:
+    project:
+      default:
+        base: pr # Only post a status to pull requests
+        informational: true # Don't block PRs based on coverage stats (yet?)
+ignore:
+  - "/src/examples"
+  - "/src/Qt/demo"
+  - "/thirdparty"
+  - "/doc"
+  - "/cmake"
+  - "/*.md"

From 6b16162b26b2aad72082823a7ec665cd9f483fe3 Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Sun, 12 Jan 2020 08:53:19 -0500
Subject: [PATCH 3/3] Reorder Travis matrix

---
 .travis.yml | 58 ++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b6b63b066..f449c3f0d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,28 +33,13 @@ addons:
     - libswresample-dev
 
 matrix:
-
   include:
-    - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
-      env:
-        - BUILD_VERSION=ffmpeg2
-        - CMAKE_EXTRA_ARGS=""
-        - TEST_TARGET="os_test"
-      os: linux
-      dist: xenial
-      addons:
-        apt:
-          sources:
-          - sourceline: 'ppa:openshot.developers/libopenshot-daily'
-          - sourceline: 'ppa:beineri/opt-qt-5.10.0-xenial'
-          packages:
-          - *ff_common
 
-    - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
+    - name: "Coverage (Ubuntu 18.04 Bionic)"
       env:
-        - BUILD_VERSION=ffmpeg3
-        - CMAKE_EXTRA_ARGS=""
-        - TEST_TARGET=test
+        - BUILD_VERSION=coverage_ffmpeg3
+        - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1"
+        - TEST_TARGET=coverage
       os: linux
       dist: bionic
       addons:
@@ -65,7 +50,8 @@ matrix:
           packages:
           - *ff_common
           - qt5-default
-          - libjsoncpp-dev
+          - lcov
+          - binutils-common # For c++filt
 
     - name: "FFmpeg 4 GCC (Ubuntu 18.04 Bionic)"
       env:
@@ -94,6 +80,23 @@ matrix:
           - libavresample4
           - libswresample3
 
+    - name: "FFmpeg 3 GCC (Ubuntu 18.04 Bionic)"
+      env:
+        - BUILD_VERSION=ffmpeg3
+        - CMAKE_EXTRA_ARGS=""
+        - TEST_TARGET=test
+      os: linux
+      dist: bionic
+      addons:
+        apt:
+          sources:
+          - sourceline: 'ppa:openshot.developers/libopenshot-daily'
+          - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
+          packages:
+          - *ff_common
+          - qt5-default
+          - libjsoncpp-dev
+
     - name: "FFmpeg 3 Clang (Ubuntu 18.04 Bionic)"
       env:
         - BUILD_VERSION=clang_ffmpeg3
@@ -112,23 +115,20 @@ matrix:
           - qt5-default
           - libomp-dev
 
-    - name: "Coverage (Ubuntu 18.04 Bionic)"
+    - name: "FFmpeg 2 GCC (Ubuntu 16.04 Xenial)"
       env:
-        - BUILD_VERSION=coverage_ffmpeg3
-        - CMAKE_EXTRA_ARGS="-DENABLE_COVERAGE=1"
-        - TEST_TARGET=coverage
+        - BUILD_VERSION=ffmpeg2
+        - CMAKE_EXTRA_ARGS=""
+        - TEST_TARGET="os_test"
       os: linux
-      dist: bionic
+      dist: xenial
       addons:
         apt:
           sources:
           - sourceline: 'ppa:openshot.developers/libopenshot-daily'
-          - sourceline: 'ppa:beineri/opt-qt-5.12.3-bionic'
+          - sourceline: 'ppa:beineri/opt-qt-5.10.0-xenial'
           packages:
           - *ff_common
-          - qt5-default
-          - lcov
-          - binutils-common # For c++filt
 
 script:
   - mkdir -p build; cd build;