refactor: simplify token env handling
This commit is contained in:
+1
-3
@@ -19,6 +19,4 @@ runs:
|
|||||||
env:
|
env:
|
||||||
GITEA_SERVER_URL: ${{ gitea.server_url }}
|
GITEA_SERVER_URL: ${{ gitea.server_url }}
|
||||||
GITEA_REPOSITORY: ${{ gitea.repository }}
|
GITEA_REPOSITORY: ${{ gitea.repository }}
|
||||||
INPUT_RUNNER_TOKEN: ${{ inputs.runner_token }}
|
RUNNER_TOKEN: ${{ inputs.runner_token || secrets.GITEA_TOKEN || secrets.RUNNER_TOKEN }}
|
||||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
|
||||||
RUNNER_TOKEN_SECRET: ${{ secrets.RUNNER_TOKEN }}
|
|
||||||
|
|||||||
+6
-17
@@ -11,24 +11,13 @@ fail() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
resolve_token() {
|
resolve_token() {
|
||||||
local source_name env_value
|
log "Trying token from RUNNER_TOKEN"
|
||||||
local sources=(
|
|
||||||
"inputs.RUNNER_TOKEN:INPUT_RUNNER_TOKEN"
|
|
||||||
"secrets.GITEA_TOKEN:GITEA_TOKEN"
|
|
||||||
"secrets.RUNNER_TOKEN:RUNNER_TOKEN_SECRET"
|
|
||||||
)
|
|
||||||
|
|
||||||
for source in "${sources[@]}"; do
|
if [[ -n "${RUNNER_TOKEN:-}" ]]; then
|
||||||
source_name="${source%%:*}"
|
log "Using token from RUNNER_TOKEN"
|
||||||
env_value="${source#*:}"
|
printf '%s' "${RUNNER_TOKEN}"
|
||||||
log "Trying token from ${source_name}"
|
return 0
|
||||||
if [[ -n "${!env_value:-}" ]]; then
|
fi
|
||||||
log "Using token from ${source_name}"
|
|
||||||
printf '%s' "${!env_value}"
|
|
||||||
return 0
|
|
||||||
fi
|
|
||||||
log "Token not found in ${source_name}, trying next source"
|
|
||||||
done
|
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user