From f4ffb1eb73e3accdb97a1a72bba8ddd0b36eb218 Mon Sep 17 00:00:00 2001
From: Taylor Smock <tsmock@fb.com>
Date: Wed, 13 Jan 2021 09:33:45 -0700
Subject: [PATCH] Gitlab-CI: Try to avoid detached pipelines

Signed-off-by: Taylor Smock <tsmock@fb.com>
---
 .gitlab-ci.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96f5320..ccae127 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -243,13 +243,10 @@ sonarcloud.io:
   script:
     - git fetch --unshallow
     - ./gradlew -Dsonar.login=$SONAR_TOKEN sonarqube
-  needs: []
-  rules:
-    - if: '$CI_COMMIT_TAG && $SONAR_TOKEN =~ /[0-9a-z]+/'
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $SONAR_TOKEN =~ /[0-9a-z]+/'
-    - if: '$CI_MERGE_REQUEST_IID && $SONAR_TOKEN =~ /[0-9a-z]+/'
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event" && $SONAR_TOKEN =~ /[0-9a-z]+/'
-
+  needs: ["test"]
+  only:
+    variables:
+      - $SONAR_TOKEN =~ /[0-9a-z]+/
 
 release:
   stage: deploy