Skip to content

Commit

Permalink
Update SonarQube dependencies (#342)
Browse files Browse the repository at this point in the history
- use current sonar scanner
- keep fake gcc, not fixed upstream via https://sonarsource.atlassian.net/browse/CPP-4482 yet
- remove obsolete caching options
  • Loading branch information
amandel authored Jun 9, 2023
1 parent 43a7299 commit c218640
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
echo $VERSION > version.txt
echo Building OBS Version: $VERSION
sed -i 's|-DBUILD_NUMBER=\\"-dev\\"|-DBUILD_NUMBER=\\"'${SEPARATOR}${PATCH}'\\"|' platformio.ini
echo "SONAR_SCANNER_VERSION=4.7.0.2747" >> $GITHUB_ENV
echo "SONAR_SCANNER_VERSION=4.8.0.2856" >> $GITHUB_ENV
- name: Cache SonarCloud packages
id: cache-sonar
Expand All @@ -72,8 +72,8 @@ jobs:
path: |
~/.sonar/cache
sonarqube
key: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng5
restore-keys: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng5
key: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng6
restore-keys: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng6

- name: Install SonarQube dependencies
if: steps.cache-sonar.outputs.cache-hit != 'true'
Expand Down Expand Up @@ -167,6 +167,8 @@ jobs:
sed -i 's|\.pio/|bin/.pio/|g' \
sonarqube-out/build-wrapper-dump.json
# replace gcc with our script that reports the fake arch "le32-unknown-nacl"
## might be fixed with https://sonarsource.atlassian.net/browse/CPP-4482
## not as of 2023-06-09
sed -i "s|/github/home/.platformio/packages/toolchain-xtensa-esp32/bin/xtensa-esp32-elf-g..|`pwd`/.github/fake-cc|g" \
sonarqube-out/build-wrapper-dump.json
./sonarqube/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin/sonar-scanner \
Expand All @@ -176,8 +178,6 @@ jobs:
-Dsonar.coverage.exclusions=**/* \
-Dsonar.sources=src \
-Dsonar.sourceEncoding=UTF-8 \
-Dsonar.cfamily.cache.enabled=false \
-Dsonar.cfamily.threads=1 \
-Dsonar.cfamily.build-wrapper-output=sonarqube-out \
-Dsonar.projectVersion=${{ env.OBS_MAJOR_VERSION }}
Expand Down

0 comments on commit c218640

Please sign in to comment.