From f7bf5a747aad70f90809749245c2e40d58d27234 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Dec 2020 16:12:51 +0100
Subject: [PATCH] gitlab-ci: improved detection of actual builds for `fdroid
 build

Apps and Builds that are disabled should obviously not be run.  But if a
merge request disables a single build and adds a build, then `fdroid build`
should run on the new build.

https://gitlab.com/fdroid/fdroiddata/-/merge_requests/7821#note_458798083
---
 .gitlab-ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4ceb350762..ffdb4a5156 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,7 +137,10 @@ fdroid build:
     - git fetch https://gitlab.com/fdroid/fdroiddata.git;
     - test -d build || mkdir build
     - for f in `git diff --name-only --diff-filter=d FETCH_HEAD...HEAD -- metadata/*.yml`; do
-          git diff FETCH_HEAD...HEAD -- $f |grep -E '^\+ *(NoSourceSince|Disabled|disable):' && continue;
+          diff=$(git diff FETCH_HEAD...HEAD -- $f);
+          echo "$diff";
+          test $(echo "$diff" | grep '^[+-] ' | grep -v '^+  *disable:' | wc -l) = 0 && continue;
+          echo "$diff" | grep -E '^\+ *(NoSourceSince|Disabled):' && continue;
           appid=`echo $f | sed -n -e 's,^metadata/\([^/][^/]*\)\.yml,\1,p'`;
           export CHANGED="$CHANGED $appid";
       done;