Browse Source

Merge pull request #4261 from nextcloud/droneCheck

merge commit should always run drone
Tobias Kaminsky 5 years ago
parent
commit
41c159ae49
1 changed files with 5 additions and 0 deletions
  1. 5 0
      scripts/checkIfRunDrone.sh

+ 5 - 0
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"