From 626bcdb8d10d22d0b379f47e15a7b23ee6f69794 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Fri, 19 Jun 2020 09:44:10 +0200 Subject: [PATCH] gitlab-ci: fix creation of 'fdroid build' job This should be run on all branches in forks and all merge requests, as long as they change a metadata file. Unfortunately gitlab-ci's "changes" logic is not as sophisticated as the logic written in the job for detecting which files changed. gitlab-ci's logic only detects changes that happened in the current push event, this job's logic compares to master. Using gitlab-ci's "changes" logic means that if someone changed a metadata file in a merge request, "fdroid build" would be triggered. If they then updated the merge request with a change to another file, then the next run would not include a "fdroid build" job, since no metadata file was changed in that push. --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35644f9ec6..e1554a2d66 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,8 +122,7 @@ fdroid build: when: always expire_in: 1 month only: - changes: - - metadata/*.yml + - branches except: - master@fdroid/fdroiddata cache: