diff --git a/.github/workflows/maven-sonar-analysis-new.yml b/.github/workflows/maven-sonar-analysis-new.yml index 900591a0..b75ad9bb 100644 --- a/.github/workflows/maven-sonar-analysis-new.yml +++ b/.github/workflows/maven-sonar-analysis-new.yml @@ -57,21 +57,12 @@ jobs: run: | echo " ossrh ${{secrets.OSSRH_USER}} ${{secrets.OSSRH_SECRET}} ossrh true gpg2 ${{secrets.GPG_SECRET}} " > $GITHUB_WORKSPACE/settings.xml - - name: Sonar Analysis + - name: Analyze with SonarCloud run: | SERVICE_KEY=$(echo "${{ inputs.SERVICE_LOCATION }}" | sed 's|^\./||; s|^\.$||; s|[^a-zA-Z0-9]|-|g; s|-\\+|-|g; s|^-||; s|-$||') FINAL_NAME="${{ github.event.repository.name }}${SERVICE_KEY:+-$SERVICE_KEY}" FULL_PROJECT_KEY="${{ secrets.ORG_KEY }}_${FINAL_NAME}" - cd "${{ inputs.SERVICE_LOCATION || '.' }}" && \ - mvn -U -B verify sonar:sonar \ - -Dgpg.skip=true \ - -Dmaven.wagon.http.retryHandler.count=2 \ - -Dsonar.projectKey=${FULL_PROJECT_KEY} \ - -Dsonar.organization=${{ secrets.ORG_KEY }} \ - -Dsonar.host.url=${{ inputs.SONAR_URL }} \ - -Dsonar.token=${{ secrets.SONAR_TOKEN }} \ - -Dsonar.projectName=${FINAL_NAME} \ - --file pom.xml -s $GITHUB_WORKSPACE/settings.xml + cd ${{ inputs.SERVICE_LOCATION }} && mvn -Psonar -U -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dgpg.skip=true -Dmaven.wagon.http.retryHandler.count=2 -Dsonar.projectKey=${FULL_PROJECT_KEY} -Dsonar.organization=${{ secrets.ORG_KEY }} -Dsonar.host.url=${{ inputs.SONAR_URL }} -Dsonar.token=${{ secrets.SONAR_TOKEN }} -Dsonar.projectName=${FINAL_NAME} --file pom.xml -s $GITHUB_WORKSPACE/settings.xml env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}