refactor: simplify token env handling

This commit is contained in:
2026-05-15 02:13:47 +00:00
parent 2f0c9ebb1c
commit bfe5d46d19
2 changed files with 7 additions and 20 deletions
+1 -3
View File
@@ -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
View File
@@ -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
} }