✏️ Remove exit status if event action is push

🪲 Use GitHub environment instead of child workdir name as defa…

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,3 +1,12 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: dwisiswant0
+
+---
+
 ### Issue and Steps to Reproduce
 <!-- Describe your issue and tell us how to reproduce it (include any useful information). -->
 
@@ -13,4 +22,4 @@
 
   - Version:
   - Platform:
-  - Subsystem:
+  - Subsystem:

Dockerfile

@@ -12,11 +12,13 @@ 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

@@ -30,13 +30,15 @@ jobs:
         login: ${{ secrets.SONARQUBE_TOKEN }}
 ```
 
-You can change the analysis base directory and/ project key _(allowed characters: letters, numbers, -, _, . and :, with at least one non-digit.)_ by using the optional input like this:
+You can change the analysis base directory and/ project key _(allowed characters: letters, numbers, -, \_, . and :, with at least one non-digit.)_ by using the optional input like this:
 
 ```yaml
 uses: kitabisa/sonarqube-action@master
 with:
-  projectBaseDir: my-custom-directory
+  projectBaseDir: "/path/to/my-custom-project"
-  projectKey: my-custom-project
+  projectKey: "my-custom-project"
+  projectName: "my-custom-project-name"
+  projectVersion: "v0.0.1"
 ```
 
 ## Secrets

action.yaml

@@ -15,6 +15,14 @@ inputs:
     description: "The project's unique key. Allowed characters are: letters, numbers, -, _, . and :, with at least one non-digit."
     required: false
     default: ""
+  projectName:
+    description: "Name of the project that will be displayed on the web interface."
+    required: false
+    default: ""
+  projectVersion:
+    description: "The project version."
+    required: false
+    default: ""
   projectBaseDir:
     description: "Set the sonar.projectBaseDir analysis property"
     required: false

entrypoint.sh

@@ -6,20 +6,24 @@ 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_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 \
+	-Dsonar.sourceEncoding=UTF-8
-	${SONAR_PASSWORD}
-