Activate multi-branch analysis

Dysnomia-Studio · Jan 1, 2022 · cd23ff9 · cd23ff9
1 parent db377f5
commit cd23ff9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -15,10 +15,7 @@ steps:
     pull-image: false
   environment:
     PLUGIN_PULL_IMAGE: false
-    SONAR_HOST: 
-      from_secret: SONAR_HOST
-    SONAR_TOKEN: 
-      from_secret: SONAR_TOKEN
+    DRONE_BRANCH: ${DRONE_BRANCH}
     DYSNOMIA_RECAPTCHA_SECRETKEY: 
       from_secret: DYSNOMIA_RECAPTCHA_SECRETKEY
     DYSNOMIA_RECAPTCHA_SITEKEY: 
@@ -29,16 +26,20 @@ steps:
       from_secret: MAIL_ADDRESS
     MAIL_PASSWORD:
       from_secret: MAIL_PASSWORD
+    SONAR_HOST: 
+      from_secret: SONAR_HOST
+    SONAR_TOKEN: 
+      from_secret: SONAR_TOKEN
   settings:
     build_args_from_env:
-      - SONAR_HOST
-      - SONAR_TOKEN
+      - DRONE_BRANCH
       - DYSNOMIA_RECAPTCHA_SECRETKEY
       - DYSNOMIA_RECAPTCHA_SITEKEY
       - MAIL_SERVER
       - MAIL_ADDRESS
       - MAIL_PASSWORD
-
+      - SONAR_HOST
+      - SONAR_TOKEN
   when:
     event:
     - push

diff --git a/Dockerfile b/Dockerfile
@@ -1,13 +1,14 @@
 FROM dysnomia/net-sdk-6-0 AS build-env
 WORKDIR /app
 
-ARG SONAR_HOST
-ARG SONAR_TOKEN
+ARG DRONE_BRANCH
 ARG DYSNOMIA_RECAPTCHA_SECRETKEY
 ARG DYSNOMIA_RECAPTCHA_SITEKEY
 ARG MAIL_SERVER
 ARG MAIL_ADDRESS
 ARG MAIL_PASSWORD
+ARG SONAR_HOST
+ARG SONAR_TOKEN
 
 # Build Project
 COPY . ./
@@ -18,7 +19,7 @@ RUN jq ".AppSettings.MailServer = \"$MAIL_SERVER\"" Dysnomia.Website.WebApp/apps
 RUN jq ".AppSettings.MailAddress = \"$MAIL_ADDRESS\"" Dysnomia.Website.WebApp/appsettings.json > tmp.appsettings.json && mv tmp.appsettings.json Dysnomia.Website.WebApp/appsettings.json
 RUN jq ".AppSettings.MailPassword = \"$MAIL_PASSWORD\"" Dysnomia.Website.WebApp/appsettings.json > tmp.appsettings.json && mv tmp.appsettings.json Dysnomia.Website.WebApp/appsettings.json
 
-RUN dotnet sonarscanner begin /k:"dysnomia" /d:sonar.host.url="$SONAR_HOST" /d:sonar.login="$SONAR_TOKEN" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover.xml" /d:sonar.coverage.exclusions="**Test*.cs"
+RUN dotnet sonarscanner begin /k:"dysnomia" /d:sonar.host.url="$SONAR_HOST" /d:sonar.login="$SONAR_TOKEN" /d:sonar.cs.opencover.reportsPaths="**/coverage.opencover.xml" /d:sonar.coverage.exclusions="**Test*.cs" /d:sonar.branch.name="$DRONE_BRANCH"
 RUN dotnet restore Dysnomia.Website.sln --ignore-failed-sources /p:EnableDefaultItems=false
 RUN dotnet publish Dysnomia.Website.sln --no-restore -c Release -o out
 RUN dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover