From 723877cee8766f5d5f4c4ca6a81f5199062493f4 Mon Sep 17 00:00:00 2001
From: Guilherme Branco Stracini <guilherme@guilhermebranco.com.br>
Date: Fri, 19 Jul 2024 16:36:12 +0100
Subject: [PATCH] Update and rename sonar-cloud.yml to sonarcloud.yml

---
 .../{sonar-cloud.yml => sonarcloud.yml}         | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)
 rename .github/workflows/{sonar-cloud.yml => sonarcloud.yml} (68%)

diff --git a/.github/workflows/sonar-cloud.yml b/.github/workflows/sonarcloud.yml
similarity index 68%
rename from .github/workflows/sonar-cloud.yml
rename to .github/workflows/sonarcloud.yml
index 034c982..6cc3e26 100644
--- a/.github/workflows/sonar-cloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -1,4 +1,4 @@
-name: Sonar Cloud
+name: SonarCloud Analysis
 
 on:
   push:
@@ -9,13 +9,14 @@ on:
   
 jobs:
   SonarCloudAnalysis:
-    name: Sonar Cloud Analysis
+    name: SonarCloud Analysis
     runs-on: windows-latest
+    
     steps:
       - name: Set up Java
         uses: actions/setup-java@v4
         with:
-          distribution: 'temurin'
+          distribution: 'temurin' # Use whatever distribution you want. I prefer Temurin or Zulu. Feel free to use any other (check SonarCloud for supported distributions and versions).
           java-version: 21
       
       - uses: actions/checkout@v4
@@ -43,6 +44,14 @@ jobs:
         run: |
           New-Item -Path .\.sonar\scanner -ItemType Directory
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+          
+      - name: Set SonarCloud variables
+        shell: bash
+        run: |
+          KEY="${{ github.repository_owner }}_${{ github.event.repository.name }}"
+          ORG="${{ github.repository_owner }}"
+          echo "KEY=${KEY}" >> "${GITHUB_ENV}"  # Keep the variable KEY as it
+          echo "ORG=${ORG@L}" >> "${GITHUB_ENV}" # Lowercase the ORG variable
       
       - name: Build and analyze
         env:
@@ -50,7 +59,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |
-          .\.sonar\scanner\dotnet-sonarscanner begin /k:"${{ github.repository_owner }}_${{ github.event.repository.name }}" /o:"${{ github.repository_owner }}" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"${{ env.KEY }}" /o:"${{ env.ORG }}" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
           dotnet build -c Release --verbosity minimal
           dotnet test -c Release --verbosity minimal --no-build --no-restore /p:CollectCoverage=true /p:CoverletOutputFormat="cobertura"
           .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"