From 40c13c0b33f6b5760296a22864e914e87f3d8f49 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Thu, 25 Jan 2024 17:47:45 -0800
Subject: [PATCH] ci(sage-monorepo): test Sonar workflow with label-based
 approval (#2461)

* Touch two oc projects

* Throw error if sonar label is missing

* Update mesage
---
 .github/workflows/sonar-scan.yml                             | 5 ++++-
 apps/openchallenges/app/src/app/app.component.html           | 1 -
 .../organization/service/OrganizationServiceApplication.java | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/sonar-scan.yml b/.github/workflows/sonar-scan.yml
index 0902540d53..0d1b78c1df 100644
--- a/.github/workflows/sonar-scan.yml
+++ b/.github/workflows/sonar-scan.yml
@@ -9,9 +9,12 @@ env:
 
 jobs:
   sonar:
-    if: contains(github.event.pull_request.labels.*.name, 'sonar-scan-approved')
     runs-on: ubuntu-latest
     steps:
+      - name: Check the presence of the label `sonar-scan-approved`
+        if: contains(github.event.pull_request.labels.*.name, 'sonar-scan-approved') != true
+        run: echo "Add the label 'sonar-scan-approved' to this PR to activate Sonar scan"; exit 1
+
       - uses: actions/checkout@v3
         name: Checkout ${{ env.HEAD_REPOSITORY }}:${{ env.HEAD_REF }}
         with:
diff --git a/apps/openchallenges/app/src/app/app.component.html b/apps/openchallenges/app/src/app/app.component.html
index 968b56dcd4..390f087df0 100644
--- a/apps/openchallenges/app/src/app/app.component.html
+++ b/apps/openchallenges/app/src/app/app.component.html
@@ -1,5 +1,4 @@
 <openchallenges-google-tag-manager *ngIf="useGoogleTagManager" />
-<!-- XXX -->
 <openchallenges-navbar
   class="mat-elevation-z6"
   [title]="title"
diff --git a/apps/openchallenges/organization-service/src/main/java/org/sagebionetworks/openchallenges/organization/service/OrganizationServiceApplication.java b/apps/openchallenges/organization-service/src/main/java/org/sagebionetworks/openchallenges/organization/service/OrganizationServiceApplication.java
index 740ba13d92..61b58e2075 100644
--- a/apps/openchallenges/organization-service/src/main/java/org/sagebionetworks/openchallenges/organization/service/OrganizationServiceApplication.java
+++ b/apps/openchallenges/organization-service/src/main/java/org/sagebionetworks/openchallenges/organization/service/OrganizationServiceApplication.java
@@ -10,6 +10,7 @@
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.ComponentScan;
 
+// Add comment to trigger Sonar
 @ComponentScan(basePackages = {"org.sagebionetworks.openchallenges"})
 @EnableEurekaClient
 @EnableFeignClients