diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 8453b2415..bace7f29f 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -53,10 +53,6 @@ jobs: - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0 with: fetch-depth: 0 - - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0 - with: - distribution: 'temurin' - java-version: '21' - name: Configure run: | cmake . @@ -66,10 +62,10 @@ jobs: wget -q https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip unzip build-wrapper-linux-x86.zip ./build-wrapper-linux-x86/build-wrapper-linux-x86-64 --out-dir bw-output make all - wget -q https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.5.0.2216-linux.zip - unzip -qq -o sonar-scanner-cli-4.5.0.2216-linux.zip - chmod +x sonar-scanner-4.5.0.2216-linux/bin/sonar-scanner - sonar-scanner-4.5.0.2216-linux/bin/sonar-scanner -Dproject.settings=tools/sonar/sonar-project.properties + wget -q https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip + unzip -qq -o sonar-scanner-cli-5.0.1.3006-linux.zip + chmod +x sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner + sonar-scanner-5.0.1.3006-linux/bin/sonar-scanner -Dproject.settings=tools/sonar/sonar-project.properties env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/tools/sonar/sonar-project.properties b/tools/sonar/sonar-project.properties index aa6fbeb0a..966d21fc9 100644 --- a/tools/sonar/sonar-project.properties +++ b/tools/sonar/sonar-project.properties @@ -2,8 +2,5 @@ sonar.organization=goatshriek-github sonar.projectKey=stumpless sonar.sources=src,test sonar.cfamily.threads=1 -sonar.cfamily.cache.enabled=false sonar.cfamily.build-wrapper-output=bw-output -sonar.cfamily.gcov.reportsPath=. sonar.sourceEncoding=UTF-8 -sonar.python.version=3.8,3.9,3.10