[Android] CI: Detect changes on master & merge_requests pipelines

[Hugo Beauzée-Luyssen]

vlc-android | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Mon May 13 18:07:44 2019 +0200| [34e5558c38caea991af88191d4b2f5cd8f9aa5b8] | committer: Hugo Beauzée-Luyssen

CI: Detect changes on master & merge_requests pipelines

> https://code.videolan.org/videolan/vlc-android/commit/34e5558c38caea991af88191d4b2f5cd8f9aa5b8
---

 .gitlab-ci.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 387723bdb..ea4ae857c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,7 @@ cache:
     only:
         refs:
             - master
+            - merge_requests
         changes:
             - libvlc/*
             - build-common
@@ -39,6 +40,7 @@ cache:
     only:
         refs:
             - master
+            - merge_requests
         changes:
             - medialibrary/*
             - compile.sh
@@ -51,14 +53,15 @@ cache:
         EXTRA_BUILD_PARAM: -ml
 
 # vlc-android app only: don't rebuild everything but use a published artifact
-# We can't filter by changes for MRs, so this is the only accepted configuration
-# for those, regardless of what changed
 continuous-app-build:
     extends: .build-all-base
     script:
         - ./compile.sh --init
         - ./gradlew assembleDebug
     only:
+        refs:
+            - master
+            - merge_requests
         changes:
             - vlc-android/**/*
             - assets/**/*