Merge pull request '更新 Dockerfile' (#55) from develop into master

Reviewed-on: #55

.gitea/workflows/master.yaml

@@ -3,22 +3,25 @@ on:
     branches:
     - master
 jobs:
-  cd:
+  version:
+    name: "CD > 計算版本號"
+    runs-on: ubuntu
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+    steps:
+    - name: 計算版本號
+      id: version
+      uses: https://gitea.jsc.idv.tw/actions/calculate-version@${{ vars.ACTION_CALCULATE_VERSION }}
+  release:
     name: "CD > 發布專案"
-    runs-on: docker
-    env:
-      RUNNER_TOOL_CACHE: /toolcache
+    runs-on: ubuntu
+    needs: version
     steps:
     - name: 發布專案
       uses: akkuman/gitea-release-action@${{ vars.ACTION_RELEASE_VERSION }}
       with:
-        tag_name: "v0.0.5"
-    - name: 計算版本號
-      id: version
-      uses: https://gitea.jsc.idv.tw/actions/calculate-version@v0.0.4
-    - name: 清理舊版本 (保留最新2個)
+        tag_name: "v${{ needs.version.outputs.version }}"
+    - name: 清理成品
       uses: https://gitea.jsc.idv.tw/actions/cleanup-release@${{ vars.ACTION_CLEANUP_RELEASE_VERSION }}
       with:
-        gitea-server: ${{ gitea.server_url }}
-        repository: ${{ gitea.repository }}
-        token: ${{ secrets.GITEA_TOKEN }}
+        RUNNER_TOKEN: ${{ secrets.RUNNER_TOKEN }}

Dockerfile

@@ -1,8 +1,7 @@
 FROM alpine:latest
 
-# 更新並安裝必要的工具
-RUN apk update \
-    && apk add --no-cache bash curl jq
+# 安裝必要的工具
+RUN apk add --no-cache --no-check-certificate bash curl jq
     
 COPY entrypoint.sh /entrypoint.sh
 

action.yaml

@@ -1,14 +1,18 @@
 name: 'CALCULATE VERSION'
 description: '計算版本號'
 author: 'Jeffery'
+inputs:
+  IS_BETA:
+    description: '是否為 beta 版本'
+    default: "false"
 outputs:
-  VERSION:
-    description: '計算出的新版本號'
-    value: ${{ steps.calculate.outputs.version }}
+  version:
+    description: '計算出的版本號'
 runs:
   using: 'docker'
   image: 'Dockerfile'
   env:
     GITEA_SERVER_URL: ${{ gitea.server_url }}
     GITEA_REPOSITORY: ${{ gitea.repository }}
-    RUNNER_TOKEN: ${{ secrets.RUNNER_TOKEN }}
+    RUNNER_TOKEN: ${{ inputs.RUNNER_TOKEN || ${{ secrets.GITEA_TOKEN }} || secrets.RUNNER_TOKEN }}
+    IS_BETA: ${{ inputs.IS_BETA }}

entrypoint.sh

@@ -12,8 +12,11 @@ echo "GITEA_SERVER_URL=$GITEA_SERVER_URL" && ([ -z "$GITEA_SERVER_URL" ] || [ "$
 # 顯示 GITEA_REPOSITORY 參數，並檢查是否為空或 "null"，如果是則輸出錯誤訊息並退出
 echo "GITEA_REPOSITORY=$GITEA_REPOSITORY" && ([ -z "$GITEA_REPOSITORY" ] || [ "$GITEA_REPOSITORY" = "null" ]) && exit 1
 
-# 顯示 RUNNER_TOKEN 參數，並檢查是否為空或 "null"，如果是則輸出錯誤訊息並退出
-echo "RUNNER_TOKEN=$RUNNER_TOKEN" && ([ -z "$RUNNER_TOKEN" ] || [ "$RUNNER_TOKEN" = "null" ]) && exit 1
+# 顯示 RUNNER_TOKEN 參數
+echo "RUNNER_TOKEN=$RUNNER_TOKEN"
+
+# 顯示 IS_BETA 參數，未設定時預設為 false
+echo "IS_BETA=$IS_BETA" && ([ -z "$IS_BETA" ] || [ "$IS_BETA" = "null" ]) && IS_BETA="false"
 
 echo "=================================================="
 
@@ -21,17 +24,23 @@ 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")"
+# 檢查是否為空或 "null"
+if [ -n "$RUNNER_TOKEN" ] && [ "$RUNNER_TOKEN" != "null" ]; then
+    # 組合 RELEASE_HEADER 參數，並顯示出來
+    RELEASE_HEADER="Authorization: token $RUNNER_TOKEN" && echo "RELEASE_HEADER=$RELEASE_HEADER"
 
-# 從成品資訊取得最新的版本號
-LATEST_VERSION=$(echo "$RELEASE_JSON" | jq -r 'if length > 0 then .[0].tag_name else "v0.0.0" end' | sed 's/^v//')
+    # 取得成品資訊
+    RELEASE_JSON="$(curl -s -H "$RELEASE_HEADER" "$RELEASE_URL")"
+else
+    # 取得成品資訊
+    RELEASE_JSON="$(curl -s "$RELEASE_URL")"
+fi
+
+# 從成品資訊取得最新的正式版版本號（排除 beta，去除 v 前綴）
+LATEST_VERSION=$(echo "$RELEASE_JSON" | jq -r '[.[] | select(.tag_name | test("-beta\\.") | not)] | if length > 0 then .[0].tag_name else "v0.0.0" end' | sed 's/^v//')
 
 # 並檢查是否為空或 "null" 後
 ([ -z "$LATEST_VERSION" ] || [ "$LATEST_VERSION" = "null" ]) && LATEST_VERSION="0.0.0"
@@ -65,5 +74,23 @@ PATCH=$((PATCH + 1))
 # 組合新的版本號
 NEW_VERSION="$MAJOR.$MINOR.$PATCH"
 
+# 如果是 beta 版本，計算 beta 編號
+if [ "$IS_BETA" = "true" ]; then
+    # 從所有 release 中找出符合 NEW_VERSION-beta.N 的最大 beta 編號
+    BETA=$(echo "$RELEASE_JSON" | jq -r --arg prefix "v$NEW_VERSION-beta." \
+        '[.[] | select(.tag_name | startswith($prefix)) | .tag_name | ltrimstr($prefix) | tonumber] | if length > 0 then max else 0 end')
+    
+    BETA=$((BETA + 1))
+
+    NEW_VERSION="$NEW_VERSION-beta.$BETA" && echo "NEW_VERSION=$NEW_VERSION"
+
+    # 將版本輸出到環境變數
+    echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT && exit 0
+fi
+
+echo "NEW_VERSION=$NEW_VERSION"
+
 # 將版本輸出到環境變數
-echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
+echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+echo "=================================================="