Improve GITHUB_DOMAIN/GITHUB_SERVER_URL default value handling (#4422)

* Improve GITHUB_DOMAIN/GITHUB_SERVER_URL default value handling

* remove extra empty line

---------

Co-authored-by: Zack Koppert <zkoppert@github.com>
This commit is contained in:
Tobias 2023-07-06 00:00:11 +02:00 committed by GitHub
parent 8cf7d8291d
commit c3901333dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -77,6 +77,15 @@ fi
# Remove trailing slash if present # Remove trailing slash if present
GITHUB_API_URL="${GITHUB_API_URL%/}" GITHUB_API_URL="${GITHUB_API_URL%/}"
# GitHub server url
if [ -n "$GITHUB_DOMAIN" ]; then
GITHUB_SERVER_URL="${GITHUB_DOMAIN}"
elif [ -z "$GITHUB_SERVER_URL" ]; then
GITHUB_SERVER_URL="https://github.com"
fi
# Extract domain name from URL
GITHUB_SERVER_URL=$(echo "$GITHUB_SERVER_URL" | cut -d '/' -f 3)
# Default Vars # Default Vars
DEFAULT_RULES_LOCATION='/action/lib/.automation' # Default rules files location DEFAULT_RULES_LOCATION='/action/lib/.automation' # Default rules files location
LINTER_RULES_PATH="${LINTER_RULES_PATH:-.github/linters}" # Linter rules directory LINTER_RULES_PATH="${LINTER_RULES_PATH:-.github/linters}" # Linter rules directory
@ -654,8 +663,6 @@ CallStatusAPI() {
debug "URL: ${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}" debug "URL: ${GITHUB_API_URL}/repos/${GITHUB_REPOSITORY}/statuses/${GITHUB_SHA}"
GITHUB_DOMAIN=$(echo "$GITHUB_DOMAIN" | cut -d '/' -f 3)
############################################## ##############################################
# Call the status API to create status check # # Call the status API to create status check #
############################################## ##############################################
@ -666,7 +673,7 @@ CallStatusAPI() {
-H "authorization: Bearer ${GITHUB_TOKEN}" \ -H "authorization: Bearer ${GITHUB_TOKEN}" \
-H 'content-type: application/json' \ -H 'content-type: application/json' \
-d "{ \"state\": \"${STATUS}\", -d "{ \"state\": \"${STATUS}\",
\"target_url\": \"https://${GITHUB_DOMAIN:-github.com}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}\", \"target_url\": \"https://${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}\",
\"description\": \"${MESSAGE}\", \"context\": \"--> Linted: ${LANGUAGE}\" \"description\": \"${MESSAGE}\", \"context\": \"--> Linted: ${LANGUAGE}\"
}" 2>&1 }" 2>&1
) )