Merge pull request #30 from leonardomerlin/patch-1

fix: use official sonnar scanner docker image

Dockerfile

@@ -1,22 +1,24 @@
-FROM newtmitch/sonar-scanner:4.0.0-alpine
+FROM sonarsource/sonar-scanner-cli:4
 
 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"
 
 RUN npm config set unsafe-perm true && \
   npm install --silent --save-dev -g typescript@3.5.2 && \
-  npm config set unsafe-perm false
+  npm config set unsafe-perm false && \
+  apk add --no-cache ca-certificates jq
+
 ENV NODE_PATH "/usr/lib/node_modules/"
 
-RUN apk add --no-cache ca-certificates jq
-
 COPY entrypoint.sh /entrypoint.sh
+
 RUN chmod +x /entrypoint.sh
+
 ENTRYPOINT ["/entrypoint.sh"]

README.md

@@ -24,7 +24,7 @@ jobs:
     steps:
     - uses: actions/checkout@master
     - name: SonarQube Scan
-      uses: kitabisa/sonarqube-action@master
+      uses: kitabisa/sonarqube-action@v1.1.0
       with:
         host: ${{ secrets.SONARQUBE_HOST }}
         login: ${{ secrets.SONARQUBE_TOKEN }}

entrypoint.sh

@@ -6,23 +6,32 @@ if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
 	EVENT_ACTION=$(jq -r ".action" "${GITHUB_EVENT_PATH}")
 	if [[ "${EVENT_ACTION}" != "opened" ]]; then
 		echo "No need to run analysis. It is already triggered by the push event."
-		exit 78
+		exit
 	fi
 fi
 
+REPOSITORY_NAME=$(basename "${GITHUB_REPOSITORY}")
+
 [[ ! -z ${INPUT_PASSWORD} ]] && SONAR_PASSWORD="${INPUT_PASSWORD}" || SONAR_PASSWORD=""
-[[ -z ${INPUT_PROJECTKEY} ]] && SONAR_PROJECTKEY="${PWD##*/}" || SONAR_PROJECTKEY="${INPUT_PROJECTKEY}"
-[[ -z ${INPUT_PROJECTNAME} ]] && SONAR_PROJECTNAME="${PWD##*/}" || SONAR_PROJECTNAME="${INPUT_PROJECTNAME}"
-[[ -z ${INPUT_PROJECTVERSION} ]] && SONAR_PROJECTVERSION="" || SONAR_PROJECTVERSION="${INPUT_PROJECTVERSION}"
 
-
+if [[ ! -f "${GITHUB_WORKSPACE}/sonar-project.properties" ]]; then
-sonar-scanner \
+  [[ -z ${INPUT_PROJECTKEY} ]] && SONAR_PROJECTKEY="${REPOSITORY_NAME}" || SONAR_PROJECTKEY="${INPUT_PROJECTKEY}"
-	-Dsonar.host.url=${INPUT_HOST} \
+  [[ -z ${INPUT_PROJECTNAME} ]] && SONAR_PROJECTNAME="${REPOSITORY_NAME}" || SONAR_PROJECTNAME="${INPUT_PROJECTNAME}"
-	-Dsonar.projectKey=${SONAR_PROJECTKEY} \
+  [[ -z ${INPUT_PROJECTVERSION} ]] && SONAR_PROJECTVERSION="" || SONAR_PROJECTVERSION="${INPUT_PROJECTVERSION}"
-	-Dsonar.projectName=${SONAR_PROJECTNAME} \
+  sonar-scanner \
-	-Dsonar.projectVersion=${SONAR_PROJECTVERSION} \
+    -Dsonar.host.url=${INPUT_HOST} \
-	-Dsonar.projectBaseDir=${INPUT_PROJECTBASEDIR} \
+    -Dsonar.projectKey=${SONAR_PROJECTKEY} \
-	-Dsonar.login=${INPUT_LOGIN} \
+    -Dsonar.projectName=${SONAR_PROJECTNAME} \
-	-Dsonar.password=${INPUT_PASSWORD} \
+    -Dsonar.projectVersion=${SONAR_PROJECTVERSION} \
-	-Dsonar.sources=. \
+    -Dsonar.projectBaseDir=${INPUT_PROJECTBASEDIR} \
-	-Dsonar.sourceEncoding=UTF-8
+    -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