Skip to content

Commit 75f37fa

Browse files
authored
Merge pull request #116 from mpaladin/sonarcloud-configuration-update
Remove SonarCloud cache setup as it is now offered by default
2 parents e5063b9 + 0051ce2 commit 75f37fa

File tree

4 files changed

+2
-17
lines changed

4 files changed

+2
-17
lines changed

.github/workflows/ci-sonar-scan.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,6 @@ jobs:
121121
path: Build/Output/ExternalsCache
122122
key: ExternalsCache-${{ matrix.config_preset }}-${{ hashFiles('Externals/*.cmake') }}
123123

124-
- name: Initialize Sonar Cache
125-
uses: actions/cache@v3
126-
with:
127-
path: .sonar/cache
128-
key: SonarCache-v2-${{ runner.os }}
129-
130124
- name: Setup Developer Command Prompt for MSVC (VS2022 x64) to build with Ninja
131125
if: ${{ matrix.os_name == 'windows' }}
132126
uses: ilammy/msvc-dev-cmd@v1

Build/Unix/Build.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,10 +251,7 @@ if [ "$IS_ANALYZE_BUILD" == true ]; then
251251
-Dsonar.sources="Apps,Modules" \
252252
-Dsonar.host.url="https://sonarcloud.io" \
253253
-Dsonar.login="$SONAR_TOKEN" \
254-
-Dsonar.cfamily.build-wrapper-output="$BUILD_DIR" \
255-
-Dsonar.cfamily.cache.path="$SONAR_SCANNER_DIR/Cache" \
256-
-Dsonar.cfamily.threads=16 \
257-
-Dsonar.cfamily.cache.enabled=true; then
254+
-Dsonar.cfamily.build-wrapper-output="$BUILD_DIR"; then
258255
echo "Sonar-scanner build failed."
259256
exit 1
260257
fi

Build/Windows/Build.bat

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,7 @@ IF DEFINED ANALYZE_BUILD (
180180
-D sonar.sources="Apps,Modules"^
181181
-D sonar.host.url="https://sonarcloud.io"^
182182
-D sonar.login="%SONAR_TOKEN%"^
183-
-D sonar.cfamily.build-wrapper-output="%BUILD_DIR%"^
184-
-D sonar.cfamily.cache.path="%SONAR_SCANNER_DIR%\Cache"^
185-
-D sonar.cfamily.threads=16^
186-
-D sonar.cfamily.cache.enabled=true
183+
-D sonar.cfamily.build-wrapper-output="%BUILD_DIR%"
187184
IF %ERRORLEVEL% NEQ 0 GOTO ERROR
188185

189186
) ELSE (

sonar-project.properties

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,3 @@ sonar.sources=Apps,Modules
99
sonar.tests=Tests
1010
sonar.sourceEncoding=UTF-8
1111
sonar.verbose=false
12-
13-
sonar.cfamily.cache.enabled=true
14-
sonar.cfamily.cache.path=.sonar/cache

0 commit comments

Comments
 (0)