Move out dotnet test command temporarily

DFE-Digital · Apr 8, 2024 · fdef212 · fdef212
1 parent c873643
commit fdef212
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/.github/workflows/continuous-integration-dotnet.yml b/.github/workflows/continuous-integration-dotnet.yml
@@ -71,14 +71,8 @@ jobs:
       run: |
         dotnet-sonarscanner begin /k:"DFE-Digital_identifiers-api" /o:"dfe-digital" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.coverageReportPaths=CoverageReport/SonarQube.xml
         dotnet build --no-restore
-<<<<<<< HEAD
         dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
         dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage"
 
 # Todo add this back to previous step once tests in place
 # reportgenerator -reports:./**/coverage.cobertura.xml -targetdir:./CoverageReport -reporttypes:SonarQube
-=======
-        dotnet test --no-build --verbosity normal --collect:"XPlat Code Coverage"
-        reportgenerator -reports:./**/coverage.cobertura.xml -targetdir:./CoverageReport -reporttypes:SonarQube
-        dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
->>>>>>> 322be4b39eb8a99247ce69050f07091f2867ef62