From 8568b318ce6d9fe743e49d776db46ced91caeaeb Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Thu, 7 Jun 2018 13:42:38 -0500
Subject: [PATCH 1/4] Integrate all branches into gitlab builder

---
 .gitlab-ci.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7c548f5..6d6f9a81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,7 +17,7 @@ linux-builder:
   when: always
   tags:
     - linux
-  only:
+  except:
     - master
 
 mac-builder:
@@ -35,7 +35,7 @@ mac-builder:
   when: always
   tags:
     - mac
-  only:
+  except:
     - master
 
 windows-builder-x86:
@@ -58,7 +58,7 @@ windows-builder-x86:
   when: always
   tags:
     - windows
-  only:
+  except:
     - master
 
 windows-builder-x64:
@@ -81,16 +81,16 @@ windows-builder-x64:
   when: always
   tags:
     - windows
-  only:
+  except:
     - master
 
 trigger-pipeline:
   stage: trigger-libopenshot
   script:
-    - "curl -X POST -F token=$LIBOPENSHOT_PIPELINE_TOKEN -F ref=master http://gitlab.openshot.org/api/v4/projects/1/trigger/pipeline"
+    - "curl -X POST -F token=$LIBOPENSHOT_PIPELINE_TOKEN -F ref=$CI_COMMIT_REF_NAME http://gitlab.openshot.org/api/v4/projects/1/trigger/pipeline"
   when: always
   dependencies: []
   tags:
     - linux
-  only:
+  except:
     - master
\ No newline at end of file

From 09a44e76b27bc4fdeffa3dfdd0dc07a2d470d1e6 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Thu, 7 Jun 2018 15:43:11 -0500
Subject: [PATCH 2/4] Re-adding master to gitlab build pipeline

---
 .gitlab-ci.yml | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d6f9a81..2fe401c2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,6 @@ linux-builder:
   when: always
   tags:
     - linux
-  except:
-    - master
 
 mac-builder:
   stage: build-libopenshot-audio
@@ -35,8 +33,6 @@ mac-builder:
   when: always
   tags:
     - mac
-  except:
-    - master
 
 windows-builder-x86:
   stage: build-libopenshot-audio
@@ -58,8 +54,6 @@ windows-builder-x86:
   when: always
   tags:
     - windows
-  except:
-    - master
 
 windows-builder-x64:
   stage: build-libopenshot-audio
@@ -81,8 +75,6 @@ windows-builder-x64:
   when: always
   tags:
     - windows
-  except:
-    - master
 
 trigger-pipeline:
   stage: trigger-libopenshot
@@ -91,6 +83,4 @@ trigger-pipeline:
   when: always
   dependencies: []
   tags:
-    - linux
-  except:
-    - master
\ No newline at end of file
+    - linux
\ No newline at end of file

From d0e70dd380a4c34cdf47773709ffa19197fd98a1 Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Tue, 11 Sep 2018 00:39:39 -0500
Subject: [PATCH 3/4] Travis CI integration (#22)

* Initial travis ci integration
* Updating travis.yml (working on a successful build)
---
 .travis.yml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..349555a2
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,22 @@
+language: cpp
+dist: trusty
+
+before_install:
+  - sudo add-apt-repository ppa:openshot.developers/libopenshot-daily -y
+  - sudo apt-get update -qq
+  - sudo apt-get install gcc-4.8 cmake libopenshot-audio-dev libunittest++-dev swig libasound2-dev libfreetype6-dev libxcursor-dev libxinerama-dev libxrandr-dev -y
+  - sudo apt autoremove -y
+  - pwd
+
+script:
+  - mkdir -p build; cd build;
+  - cmake -D"CMAKE_BUILD_TYPE:STRING=Debug" ../
+  - make VERBOSE=1
+
+notifications:
+  email: true
+
+env:
+  global:
+  - TRAVIS_LIBOPENSHOT=TEST
+  - LANG="en_US.UTF-8"
\ No newline at end of file

From feafc5df6d90885d2027b7516af06ed5f51a947a Mon Sep 17 00:00:00 2001
From: Jonathan Thomas <jonathan@openshot.org>
Date: Sat, 15 Sep 2018 18:38:50 -0500
Subject: [PATCH 4/4] Bumping version to 0.1.7 (SO: still 6)

---
 include/Version.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/Version.h b/include/Version.h
index 3af3d9be..545b3900 100644
--- a/include/Version.h
+++ b/include/Version.h
@@ -36,7 +36,7 @@
 
 #define OPENSHOT_AUDIO_VERSION_MAJOR 0;	/// Major version number is incremented when huge features are added or improved.
 #define OPENSHOT_AUDIO_VERSION_MINOR 1;	/// Minor version is incremented when smaller (but still very important) improvements are added.
-#define OPENSHOT_AUDIO_VERSION_BUILD 6;	/// Build number is incremented when minor bug fixes and less important improvements are added.
+#define OPENSHOT_AUDIO_VERSION_BUILD 7;	/// Build number is incremented when minor bug fixes and less important improvements are added.
 #define OPENSHOT_AUDIO_VERSION_SO 6;	/// Shared object version number. This increments any time the API and ABI changes (so old apps will no longer link)
 #define OPENSHOT_AUDIO_VERSION_MAJOR_MINOR STRINGIZE(OPENSHOT_AUDIO_VERSION_MAJOR) "." STRINGIZE(OPENSHOT_AUDIO_VERSION_MINOR); /// A string of the "Major.Minor" version
 #define OPENSHOT_AUDIO_VERSION_ALL STRINGIZE(OPENSHOT_AUDIO_VERSION_MAJOR) "." STRINGIZE(OPENSHOT_AUDIO_VERSION_MINOR) "." STRINGIZE(OPENSHOT_AUDIO_VERSION_BUILD); /// A string of the entire version "Major.Minor.Build"