diff --git a/Dockerfile b/Dockerfile index e354b97..e493ae1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM newtmitch/sonar-scanner:4.0.0-alpine +FROM newtmitch/sonar-scanner:4.5 LABEL "com.github.actions.name"="SonarQube Scan" LABEL "com.github.actions.description"="Scan your code with SonarQube Scanner to detect bugs, vulnerabilities and code smells in more than 25 programming languages." LABEL "com.github.actions.icon"="check" LABEL "com.github.actions.color"="green" -LABEL version="0.0.1" +LABEL version="0.0.2" LABEL repository="https://github.com/kitabisa/sonarqube-action" LABEL homepage="https://kitabisa.github.io" LABEL maintainer="dwisiswant0" diff --git a/entrypoint.sh b/entrypoint.sh index be7e3d3..b08528c 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -13,17 +13,25 @@ fi REPOSITORY_NAME=$(basename "${GITHUB_REPOSITORY}") [[ ! -z ${INPUT_PASSWORD} ]] && SONAR_PASSWORD="${INPUT_PASSWORD}" || SONAR_PASSWORD="" -[[ -z ${INPUT_PROJECTKEY} ]] && SONAR_PROJECTKEY="${REPOSITORY_NAME}" || SONAR_PROJECTKEY="${INPUT_PROJECTKEY}" -[[ -z ${INPUT_PROJECTNAME} ]] && SONAR_PROJECTNAME="${REPOSITORY_NAME}" || SONAR_PROJECTNAME="${INPUT_PROJECTNAME}" -[[ -z ${INPUT_PROJECTVERSION} ]] && SONAR_PROJECTVERSION="" || SONAR_PROJECTVERSION="${INPUT_PROJECTVERSION}" -sonar-scanner \ - -Dsonar.host.url=${INPUT_HOST} \ - -Dsonar.projectKey=${SONAR_PROJECTKEY} \ - -Dsonar.projectName=${SONAR_PROJECTNAME} \ - -Dsonar.projectVersion=${SONAR_PROJECTVERSION} \ - -Dsonar.projectBaseDir=${INPUT_PROJECTBASEDIR} \ - -Dsonar.login=${INPUT_LOGIN} \ - -Dsonar.password=${INPUT_PASSWORD} \ - -Dsonar.sources=. \ - -Dsonar.sourceEncoding=UTF-8 +if [[ ! -f "${GITHUB_WORKSPACE}/sonar-project.properties" ]]; then + [[ -z ${INPUT_PROJECTKEY} ]] && SONAR_PROJECTKEY="${REPOSITORY_NAME}" || SONAR_PROJECTKEY="${INPUT_PROJECTKEY}" + [[ -z ${INPUT_PROJECTNAME} ]] && SONAR_PROJECTNAME="${REPOSITORY_NAME}" || SONAR_PROJECTNAME="${INPUT_PROJECTNAME}" + [[ -z ${INPUT_PROJECTVERSION} ]] && SONAR_PROJECTVERSION="" || SONAR_PROJECTVERSION="${INPUT_PROJECTVERSION}" + sonar-scanner \ + -Dsonar.host.url=${INPUT_HOST} \ + -Dsonar.projectKey=${SONAR_PROJECTKEY} \ + -Dsonar.projectName=${SONAR_PROJECTNAME} \ + -Dsonar.projectVersion=${SONAR_PROJECTVERSION} \ + -Dsonar.projectBaseDir=${INPUT_PROJECTBASEDIR} \ + -Dsonar.login=${INPUT_LOGIN} \ + -Dsonar.password=${SONAR_PASSWORD} \ + -Dsonar.sources=. \ + -Dsonar.sourceEncoding=UTF-8 +else + sonar-scanner \ + -Dsonar.host.url=${INPUT_HOST} \ + -Dsonar.projectBaseDir=${INPUT_PROJECTBASEDIR} \ + -Dsonar.login=${INPUT_LOGIN} \ + -Dsonar.password=${SONAR_PASSWORD} +fi