From bfe5d46d19d6c984c5abe2398397deed7e9d81ab Mon Sep 17 00:00:00 2001 From: Jeffery Date: Fri, 15 May 2026 02:13:47 +0000 Subject: [PATCH] refactor: simplify token env handling --- action.yaml | 4 +--- entrypoint.sh | 23 ++++++----------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/action.yaml b/action.yaml index 2de13d3..ae2f94e 100644 --- a/action.yaml +++ b/action.yaml @@ -19,6 +19,4 @@ runs: env: GITEA_SERVER_URL: ${{ gitea.server_url }} GITEA_REPOSITORY: ${{ gitea.repository }} - INPUT_RUNNER_TOKEN: ${{ inputs.runner_token }} - GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} - RUNNER_TOKEN_SECRET: ${{ secrets.RUNNER_TOKEN }} + RUNNER_TOKEN: ${{ inputs.runner_token || secrets.GITEA_TOKEN || secrets.RUNNER_TOKEN }} diff --git a/entrypoint.sh b/entrypoint.sh index 2deb17c..b2de6b8 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -11,24 +11,13 @@ fail() { } resolve_token() { - local source_name env_value - local sources=( - "inputs.RUNNER_TOKEN:INPUT_RUNNER_TOKEN" - "secrets.GITEA_TOKEN:GITEA_TOKEN" - "secrets.RUNNER_TOKEN:RUNNER_TOKEN_SECRET" - ) + log "Trying token from RUNNER_TOKEN" - for source in "${sources[@]}"; do - source_name="${source%%:*}" - env_value="${source#*:}" - log "Trying token from ${source_name}" - if [[ -n "${!env_value:-}" ]]; then - log "Using token from ${source_name}" - printf '%s' "${!env_value}" - return 0 - fi - log "Token not found in ${source_name}, trying next source" - done + if [[ -n "${RUNNER_TOKEN:-}" ]]; then + log "Using token from RUNNER_TOKEN" + printf '%s' "${RUNNER_TOKEN}" + return 0 + fi return 1 }