Skip to content

Commit c218640

Browse files
authored
Update SonarQube dependencies (#342)
- use current sonar scanner - keep fake gcc, not fixed upstream via https://sonarsource.atlassian.net/browse/CPP-4482 yet - remove obsolete caching options
1 parent 43a7299 commit c218640

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
echo $VERSION > version.txt
6464
echo Building OBS Version: $VERSION
6565
sed -i 's|-DBUILD_NUMBER=\\"-dev\\"|-DBUILD_NUMBER=\\"'${SEPARATOR}${PATCH}'\\"|' platformio.ini
66-
echo "SONAR_SCANNER_VERSION=4.7.0.2747" >> $GITHUB_ENV
66+
echo "SONAR_SCANNER_VERSION=4.8.0.2856" >> $GITHUB_ENV
6767
6868
- name: Cache SonarCloud packages
6969
id: cache-sonar
@@ -72,8 +72,8 @@ jobs:
7272
path: |
7373
~/.sonar/cache
7474
sonarqube
75-
key: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng5
76-
restore-keys: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng5
75+
key: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng6
76+
restore-keys: ${{ runner.os }}-sonar-${{ env.SONAR_SCANNER_VERSION }}-ng6
7777

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

0 commit comments

Comments
 (0)