From a1df5ef86a05ebe405d0ccb3686826f92d912220 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 10 Nov 2020 16:53:00 +0100
Subject: [PATCH] gitlab-ci: try rules:changes: to limit "fdroiddata fdroid
 build" runs

https://docs.gitlab.com/ee/ci/yaml/#using-onlychanges-with-pipelines-for-merge-requests
---
 .gitlab-ci.yml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 21ff21d9..2adbfc76 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -247,9 +247,13 @@ gradle:
 # this tests the basic setup of the 'fdroid build' CI job in fdroiddata
 fdroiddata fdroid build:
   image: registry.gitlab.com/fdroid/ci-images-client:latest
-  only:
-    changes:
-      - buildserver/provision-apt-get-install
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
+      changes:
+        - buildserver/provision-apt-get-install
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes:
+        - buildserver/provision-apt-get-install
   script:
     - bash buildserver/provision-apt-get-install http://deb.debian.org/debian
     - apt-get dist-upgrade