diff --git a/.drone.yml b/.drone.yml index 8207b89d17..e9a0ecc815 100644 --- a/.drone.yml +++ b/.drone.yml @@ -59,7 +59,7 @@ services: environment: EVAL: true commands: - - BRANCH='stable18' /usr/local/bin/initnc.sh + - BRANCH='stable20' /usr/local/bin/initnc.sh - echo 127.0.0.1 server >> /etc/hosts - su www-data -c "OC_PASS=user1 php /var/www/html/occ user:add --password-from-env --display-name='User One' user1" - su www-data -c "OC_PASS=user2 php /var/www/html/occ user:add --password-from-env --display-name='User Two' user2" @@ -68,9 +68,9 @@ services: - su www-data -c "php /var/www/html/occ group:add users" - su www-data -c "php /var/www/html/occ group:adduser users user1" - su www-data -c "php /var/www/html/occ group:adduser users user2" - - su www-data -c "git clone -b stable18 https://github.com/nextcloud/activity.git /var/www/html/apps/activity/" + - su www-data -c "git clone -b stable20 https://github.com/nextcloud/activity.git /var/www/html/apps/activity/" - su www-data -c "php /var/www/html/occ app:enable activity" - - su www-data -c "git clone -b stable18 https://github.com/nextcloud/text.git /var/www/html/apps/text/" + - su www-data -c "git clone -b stable20 https://github.com/nextcloud/text.git /var/www/html/apps/text/" - su www-data -c "php /var/www/html/occ app:enable text" - su www-data -c "php /var/www/html/occ app:enable end_to_end_encryption" - /usr/local/bin/run.sh diff --git a/scripts/checkIfRunDrone.sh b/scripts/checkIfRunDrone.sh index a507614808..23e637fbe0 100755 --- a/scripts/checkIfRunDrone.sh +++ b/scripts/checkIfRunDrone.sh @@ -6,7 +6,7 @@ if [ -z $3 ] ; then fi export BRANCH=$(scripts/analysis/getBranchBase.sh $1 $2 $3 | sed s'/"//'g) -if [ $(git diff --name-only origin/$BRANCH | grep -cE "^src|^screenshots|build.gradle") -eq 0 ] ; then +if [ $(git diff --name-only origin/$BRANCH | grep -cE "^src|screenshots|build.gradle|.drone.yml") -eq 0 ] ; then echo "No source files changed" exit 1 else