From 18b80e5b39b36c1fe4c840bb022efa622dbfb528 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 18 Jun 2020 12:55:36 +0200
Subject: [PATCH] gitlab-ci: ditch 'merge_requests' rule, it has strange
 behavior

It makes its own pipeline, which hides other jobs like lint which should be
displayed together on the merge request.

https://docs.gitlab.com/ee/ci/merge_request_pipelines/index.html
---
 .gitlab-ci.yml | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e563eaab4d..460842bfe8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,10 +111,10 @@ fdroid build:
     when: always
     expire_in: 1 month
   only:
-    refs:
-      - merge_requests
     changes:
       - metadata/*.yml
+  except:
+    - master@fdroid/fdroiddata
   cache:
     key: "$CI_JOB_NAME"
     paths:
@@ -155,6 +155,14 @@ fdroid build:
     - fdroid build --verbose --on-server --latest --no-tarball --no-refresh  $CHANGED
 
 
+# issuebot needs secrets to run, so it has to run under the 'fdroid'
+# group, therefore needs the trigger without secrets, there would be
+# no support for virustotal, github downloads, exodus privacy checks,
+# etc.  That means it has to be triggered from the lint: job, which
+# runs in the fork's CI.
+#
+# This job has to be called 'pages' because it deploys the JSON API
+# to GitLab Pages.
 pages:
   image: registry.gitlab.com/fdroid/ci-images-client:latest
   only: