Merge pull request #10 from kitabisa/development

🪲 Use GitHub environment instead of child workdir name as defa…
🪲 Use GitHub environment instead of child workdir name as default value of project key & name
2020-07-26 06:08:30 +07:00 · 2020-07-26 03:20:28 +07:00
1 changed files with 5 additions and 4 deletions
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -10,11 +10,12 @@ if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
 	fi
 fi

-[[ ! -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}"
+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} \
Author	SHA1	Message	Date
Dwi Siswanto	276b0c8370	Merge pull request #10 from kitabisa/development 🪲 Use GitHub environment instead of child workdir name as defa…	2020-07-26 06:08:30 +07:00
Dwi Siswanto	6c4cd0d6d9	🪲 Use GitHub environment instead of child workdir name as default value of project key & name	2020-07-26 03:20:28 +07:00