From 53633991d297f929cbe93eb51211480c1c9878a2 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 25 Jul 2019 11:54:12 +0200
Subject: [PATCH] merge commit should always run drone

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 scripts/checkIfRunDrone.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/checkIfRunDrone.sh b/scripts/checkIfRunDrone.sh
index ded7311ea0..7f61962349 100755
--- a/scripts/checkIfRunDrone.sh
+++ b/scripts/checkIfRunDrone.sh
@@ -1,5 +1,10 @@
 #!/bin/sh -e
 
+if [ -z $3 ] ; then
+    echo "Merge commit to master -> continue with CI"
+    exit 0
+fi
+
 export BRANCH=$(scripts/analysis/getBranchBase.sh $1 $2 $3 | sed s'/"//'g)
 if [ $(git diff --name-only origin/$BRANCH | grep -cE "^src|build.gradle") -eq 0 ] ; then
     echo "No source files changed"