Fix CI issues (#631)
* Bump JDK version * Fix: Use sonar.token instead of deprecated login * Test if sonar has a problem with doctype * Exclude website-folder from sonar scan * Fix: Replace another sonar.login --------- Co-authored-by: Florian Ostertag <git@florian-ostertag.de>
This commit is contained in:
1 parent
dbc1738da1
commit
05064b1904
1 file changed
+5
-4
+5
-4
@@ -59,14 +59,15 @@ before_build:
|
||||
|
||||
if($Env:MAIN_REPO -and ($Env:PLATFORM -eq 'x64'))
|
||||
{
|
||||
$env:JAVA_HOME="C:\Program Files\Java\jdk11"
|
||||
$env:JAVA_HOME="C:\Program Files\Java\jdk17"
|
||||
if ($Env:APPVEYOR_PULL_REQUEST_NUMBER){
|
||||
choco install "msbuild-sonarqube-runner" -y
|
||||
SonarScanner.MSBuild.exe begin `
|
||||
/k:"Vocaluxe" `
|
||||
/o:"vocaluxe" `
|
||||
/d:sonar.exclusions="Vocaluxe/Website/**/*" `
|
||||
/d:sonar.host.url="https://sonarcloud.io" `
|
||||
/d:sonar.login="$Env:SonarQubeToken" `
|
||||
/d:sonar.token="$Env:SonarQubeToken" `
|
||||
/d:"sonar.pullrequest.key=$env:APPVEYOR_PULL_REQUEST_NUMBER" `
|
||||
/d:"sonar.pullrequest.base=$env:APPVEYOR_REPO_BRANCH" `
|
||||
/d:"sonar.pullrequest.branch=$env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH"
|
||||
@@ -78,7 +79,7 @@ before_build:
|
||||
/o:"vocaluxe" `
|
||||
/d:sonar.host.url="https://sonarcloud.io" `
|
||||
/v:"$Env:GIT_VERSION_TAG" `
|
||||
/d:sonar.login="$Env:SonarQubeToken" `
|
||||
/d:sonar.token="$Env:SonarQubeToken" `
|
||||
/d:sonar.cs.nunit.reportsPaths=".\TestResult.xml" `
|
||||
/d:sonar.cs.opencover.reportsPaths=".\CoverageResult.xml"
|
||||
}
|
||||
@@ -124,7 +125,7 @@ test_script:
|
||||
after_test:
|
||||
- ps: |
|
||||
if (($Env:MAIN_REPO) -and ($Env:PLATFORM -eq 'x64') -and ($Env:APPVEYOR_PULL_REQUEST_NUMBER -or $Env:APPVEYOR_REPO_BRANCH -eq 'develop')){
|
||||
SonarScanner.MSBuild.exe end /d:sonar.login="$Env:SonarQubeToken"
|
||||
SonarScanner.MSBuild.exe end /d:sonar.token="$Env:SonarQubeToken"
|
||||
}
|
||||
before_deploy:
|
||||
- ps: ./.appveyor/prepareDeploy.ps1
|
||||
|
||||
Reference in new issue
Block a user