From b1ead7029e293ff57b014bb355b51c3d87d649f6 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Mon, 27 Feb 2017 19:03:43 -0600 Subject: [PATCH 1/2] CI: Deploy on tags and master branch --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index d1f14372b..43df27304 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,6 +36,8 @@ deploy: on: repo: jp9000/obs-studio condition: "$TRAVIS_OS_NAME = osx" + tags: true + branch: master # The channel name "azubu.il.us.quakenet.org#obs-dev" is encrypted against jp9000/obs-studio to prevent IRC spam of forks notifications: From 227a4eab7f61175c0bb55c3d7256aae83104e5ce Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Mon, 27 Feb 2017 19:28:01 -0600 Subject: [PATCH 2/2] CI: OSX - Deploy on all branches in the master repo. --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 43df27304..5809a4c9d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -36,8 +36,7 @@ deploy: on: repo: jp9000/obs-studio condition: "$TRAVIS_OS_NAME = osx" - tags: true - branch: master + all_branches: true # The channel name "azubu.il.us.quakenet.org#obs-dev" is encrypted against jp9000/obs-studio to prevent IRC spam of forks notifications: