From 61dccca9fd863b97d77fb1c8f25e80574c256986 Mon Sep 17 00:00:00 2001 From: "antoine.vinot" Date: Mon, 20 May 2024 15:47:23 +0200 Subject: [PATCH] SCSCANGHA-13 Warning instead of failure for Maven/Gradle projects --- .github/workflows/qa.yml | 34 ++++++++++++++++------------------ entrypoint.sh | 8 ++++---- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index ba76818..f3af6f1 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -63,9 +63,9 @@ jobs: run: | echo "Expected previous step to fail" exit 1 - failFastGradleTest: + dontFailGradleTest: name: > - Fail fast on Gradle project + Don't fail on Gradle project runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -79,14 +79,13 @@ jobs: SONAR_TOKEN: FAKE_TOKEN with: projectBaseDir: ./test/gradle-project - - name: Previous should have failed - if: ${{ steps.runTest.outcome == 'success'}} + args: -Dsonar.scanner.dumpToFile=./output.properties + - name: Assert run: | - echo "Expected previous step to fail" - exit 1 - failFastGradleKotlinTest: + ./test/assertFileExists ./output.properties + dontFailGradleKotlinTest: name: > - Fail fast on Kotlin Gradle project + Don't fail on Kotlin Gradle project runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -100,14 +99,13 @@ jobs: SONAR_TOKEN: FAKE_TOKEN with: projectBaseDir: ./test/gradle-project-kotlin - - name: Previous should have failed - if: ${{ steps.runTest.outcome == 'success'}} + args: -Dsonar.scanner.dumpToFile=./output.properties + - name: Assert run: | - echo "Expected previous step to fail" - exit 1 - failFastMavenTest: + ./test/assertFileExists ./output.properties + dontFailMavenTest: name: > - Fail fast on Maven project + Don't fail on Maven project runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -121,11 +119,10 @@ jobs: SONAR_TOKEN: FAKE_TOKEN with: projectBaseDir: ./test/maven-project - - name: Previous should have failed - if: ${{ steps.runTest.outcome == 'success'}} + args: -Dsonar.scanner.dumpToFile=./output.properties + - name: Assert run: | - echo "Expected previous step to fail" - exit 1 + ./test/assertFileExists ./output.properties runnerDebugUsedTest: name: > 'RUNNER_DEBUG' is used @@ -144,3 +141,4 @@ jobs: - name: Assert run: | ./test/assertFileContains ./output.properties "sonar.verbose=true" + diff --git a/entrypoint.sh b/entrypoint.sh index 664602f..9cd1c40 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -8,13 +8,13 @@ if [[ -z "${SONAR_TOKEN}" ]]; then fi if [[ -f "${INPUT_PROJECTBASEDIR%/}/pom.xml" ]]; then - echo "Maven project detected. You should run the goal 'org.sonarsource.scanner.maven:sonar' during build rather than using this GitHub Action." - exit 1 + echo "WARNING! Maven project detected. Sonar recommends running the 'org.sonarsource.scanner.maven:sonar-maven-plugin:sonar' goal during the build process instead of using this GitHub Action + to get more accurate results." fi if [[ -f "${INPUT_PROJECTBASEDIR%/}/build.gradle" || -f "${INPUT_PROJECTBASEDIR%/}/build.gradle.kts" ]]; then - echo "Gradle project detected. You should use the SonarQube plugin for Gradle during build rather than using this GitHub Action." - exit 1 + echo "WARNING! Gradle project detected. Sonar recommends using the SonarQube plugin for Gradle during the build process instead of using this GitHub Action + to get more accurate results." fi if [[ -z "${SONARCLOUD_URL}" ]]; then