From 52bdc38674ed49d0a9000b979fad6dcfafe6da10 Mon Sep 17 00:00:00 2001 From: Jeffery Date: Fri, 20 Mar 2026 16:32:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=A6=82=E6=9E=9C=E6=B2=92?= =?UTF-8?q?=E6=9C=89=20token=20=E5=B0=B1=E4=B8=8D=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E8=99=95=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entrypoint.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index b10da44..7f0b370 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -21,14 +21,19 @@ echo "取得最新的版本號" echo "--------------------------------------------------" -# 組合 RELEASE_HEADER 參數,並顯示出來 -RELEASE_HEADER="Authorization: token $RUNNER_TOKEN" && echo "RELEASE_HEADER=$RELEASE_HEADER" - # 組合 RELEASE_URL 參數,並顯示出來 RELEASE_URL="$GITEA_SERVER_URL/api/v1/repos/$GITEA_REPOSITORY/releases" && echo "RELEASE_URL=$RELEASE_URL" -# 取得成品資訊 -RELEASE_JSON="$(curl -s -H "$RELEASE_HEADER" "$RELEASE_URL")" +if [ -z "$RUNNER_TOKEN" ] || [ "$RUNNER_TOKEN" = "null" ]; then + # 組合 RELEASE_HEADER 參數,並顯示出來 + RELEASE_HEADER="Authorization: token $RUNNER_TOKEN" && echo "RELEASE_HEADER=$RELEASE_HEADER" + + # 取得成品資訊 + RELEASE_JSON="$(curl -s "$RELEASE_URL")" +else + # 取得成品資訊 + RELEASE_JSON="$(curl -s -H "$RELEASE_HEADER" "$RELEASE_URL")" +fi # 從成品資訊取得最新的版本號 LATEST_VERSION=$(echo "$RELEASE_JSON" | jq -r 'if length > 0 then .[0].tag_name else "v0.0.0" end' | sed 's/^v//') From 2aa38cd6db9d7a014a8e2d4ab3d8b2edd1aac19d Mon Sep 17 00:00:00 2001 From: Jeffery Date: Fri, 20 Mar 2026 16:37:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E4=BF=AE=E6=AD=A3=E9=82=8F?= =?UTF-8?q?=E8=BC=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- action.yaml | 1 - entrypoint.sh | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/action.yaml b/action.yaml index 4b174a7..5f871c4 100644 --- a/action.yaml +++ b/action.yaml @@ -8,7 +8,6 @@ author: 'Jeffery' outputs: VERSION: description: '計算出的新版本號' - value: ${{ steps.calculate.outputs.version }} runs: using: 'docker' image: 'Dockerfile' diff --git a/entrypoint.sh b/entrypoint.sh index 7f0b370..83638cb 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -24,15 +24,15 @@ echo "--------------------------------------------------" # 組合 RELEASE_URL 參數,並顯示出來 RELEASE_URL="$GITEA_SERVER_URL/api/v1/repos/$GITEA_REPOSITORY/releases" && echo "RELEASE_URL=$RELEASE_URL" -if [ -z "$RUNNER_TOKEN" ] || [ "$RUNNER_TOKEN" = "null" ]; then +if [ -n "$RUNNER_TOKEN" ] && [ "$RUNNER_TOKEN" != "null" ]; then # 組合 RELEASE_HEADER 參數,並顯示出來 RELEASE_HEADER="Authorization: token $RUNNER_TOKEN" && echo "RELEASE_HEADER=$RELEASE_HEADER" # 取得成品資訊 - RELEASE_JSON="$(curl -s "$RELEASE_URL")" + RELEASE_JSON="$(curl -s -H "$RELEASE_HEADER" "$RELEASE_URL")" else # 取得成品資訊 - RELEASE_JSON="$(curl -s -H "$RELEASE_HEADER" "$RELEASE_URL")" + RELEASE_JSON="$(curl -s "$RELEASE_URL")" fi # 從成品資訊取得最新的版本號