From 07131e981b8ba64b3c947d57a21e78b7f8db0fee Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 21 Mar 2019 13:12:10 +0100
Subject: [PATCH] gitlab-ci: purge only: merge_requests, it doesn't work for
 this

The merge_requests feature is really confusing, and doesn't seem to do
anything useful for what we need it to.  Like it doesn't let new
contributors' merge requests run on the fdroid runners.
---
 .gitlab-ci.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6fb1c8fc0..10a4189ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -54,7 +54,6 @@ errorprone:
   script:
     - cat config/errorprone.gradle >> app/build.gradle
     - ./gradlew assembleDebug
-  allow_failure: true
 
 # once these prove stable, the task should be switched to
 # connectedCheck to test all the build flavors
@@ -99,8 +98,6 @@ errorprone:
 
 connected 22 default armeabi-v7a:
   retry: 1
-  only:
-    - merge_requests
   <<: *test-template
   <<: *connected-template
 
@@ -125,9 +122,6 @@ connected 23 default x86:
 
 connected 25 default x86:
   <<: *kvm-template
-  allow_failure: false
-  only:
-    - merge_requests
 
 connected 26 google_apis x86:
   <<: *kvm-template