fix: FIR-48856 fix sonar (#136)

Author: bogdantruta-firebolt

.github/workflows/pull-request.yml

@@ -9,9 +9,9 @@ jobs:
  runs-on: ubuntu-latest
  steps:
  - name: Check title name convention
- uses: jef/conventional-commits-pr-action@v1.0.0
+ uses: firebolt-db/action-pr-checks@519d59493b028e944971deaeca570933c378f09e
  with:
- token: ${{ secrets.GITHUB_TOKEN }}
+ github-key: ${{ secrets.GITHUB_TOKEN }}
  build:
  uses: ./.github/workflows/build.yml
  code-checkers:
@@ -20,5 +20,6 @@ jobs:
  uses: ./.github/workflows/unit-tests.yml
  sonar-scan:
  uses: ./.github/workflows/sonar-scan.yml
+ needs: [build, unit-tests]
  secrets:
  SONARCLOUD_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}

.github/workflows/sonar-scan.yml

@@ -8,50 +8,41 @@ on:
 jobs:
  build:
  name: Build and analyze
- runs-on: windows-latest
+ runs-on: ubuntu-latest # <-- match OS of the artifacts producer
  steps:
- - name: Set up JDK 17
- uses: actions/setup-java@v3
+ - uses: actions/checkout@v4
  with:
- java-version: 17
- distribution: 'zulu'
- - uses: actions/checkout@v3
- with:
- fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- - name: Cache SonarCloud packages
- uses: actions/cache@v3
+ fetch-depth: 0
+
+ - uses: actions/download-artifact@v4
  with:
- path: ~\sonar\cache
- key: ${{ runner.os }}-sonar
- restore-keys: ${{ runner.os }}-sonar
+ name: test-artifacts
+ path: artifacts
 
- - name: Cache SonarCloud scanner
- id: cache-sonar-scanner
- uses: actions/cache@v3
+ - uses: actions/setup-dotnet@v4
  with:
- path: .\.sonar\scanner
- key: ${{ runner.os }}-sonar-scanner
- restore-keys: ${{ runner.os }}-sonar-scanner
+ dotnet-version: 6.0.x
 
  - name: Install SonarCloud scanner
- if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
- shell: powershell
- run: |
- New-Item -Path .\.sonar\scanner -ItemType Directory
- dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+ run: dotnet tool update dotnet-sonarscanner --tool-path ./.sonar/scanner
 
- - name: Install Coverage tool
- shell: powershell
+ - name: Sonar begin
+ env:
+ SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
  run: |
- dotnet tool install --global dotnet-coverage
+ ./.sonar/scanner/dotnet-sonarscanner begin \
+ /k:"firebolt-db_firebolt-net-sdk" \
+ /o:"firebolt-db" \
+ /d:sonar.token="$SONAR_TOKEN" \
+ /d:sonar.host.url="https://sonarcloud.io" \
+ /d:sonar.cs.vscoveragexml.reportsPaths="artifacts/coverage/coverage.xml" \
+ /d:sonar.cs.vstest.reportsPaths="artifacts/**/*.trx"
+
+ #Sonar needs this step to collect the required information about the project
+ - name: Build
+ run: dotnet build --no-incremental
 
- - name: Build and analyze
+ - name: Sonar end
  env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
  SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
- shell: powershell
- run: |
- .\.sonar\scanner\dotnet-sonarscanner begin /k:"firebolt-db_firebolt-net-sdk" /o:"firebolt-db" /d:sonar.token="${{ secrets.SONARCLOUD_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths="coverage.xml"
- dotnet build --no-incremental
- dotnet-coverage collect 'dotnet test --filter "Category!=Integration"' -f xml -o "coverage.xml"
- .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONARCLOUD_TOKEN }}"
+ run: ./.sonar/scanner/dotnet-sonarscanner end /d:sonar.token="$SONAR_TOKEN"

.github/workflows/unit-tests.yml

@@ -26,10 +26,22 @@ jobs:
  run: |
  dotnet new globaljson --sdk-version '${{ steps.dotnet-setup.outputs.dotnet-version }}'
 
+ - name: Install coverage tool
+ run: dotnet tool install --global dotnet-coverage --version 17.12.6
+
  - name: Install dependencies
  run: |
  dotnet restore
 
  - name: Run unit tests
  run: |
- dotnet test --filter "Category!=Integration"
+ mkdir -p coverage
+ dotnet-coverage collect 'dotnet test --filter "Category!=Integration" --logger trx' -f xml -o "coverage/coverage.xml"
+
+ - name: Upload test artifacts
+ uses: actions/upload-artifact@v4
+ with:
+ name: test-artifacts
+ path: |
+ **/TestResults/*.trx
+ coverage/coverage.xml