Merge branch 'develop' of https://gitea.jsc.idv.tw/actions/calculate-version into develop

.gitea/workflows/master.yaml

@@ -3,29 +3,25 @@ on:
     branches:
     - master
 jobs:
-  cd:
+  version:
-    name: "CD > 發布專案"
+    name: "CD > 計算版本號"
-    runs-on: docker
+    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: ubuntu
+    needs: version
+    steps:
     - name: 發布專案
       uses: akkuman/gitea-release-action@${{ vars.ACTION_RELEASE_VERSION }}
       with:
-        tag_name: "v0.1.3"
+        tag_name: "v${{ needs.version.outputs.version }}"
-    - name: 計算版本號
+    - name: 清理成品
-      id: version
-      uses: https://gitea.jsc.idv.tw/actions/calculate-version@v0.1.2
-    - name: 清理舊版本 (保留最新2個)
       uses: https://gitea.jsc.idv.tw/actions/cleanup-release@${{ vars.ACTION_CLEANUP_RELEASE_VERSION }}
       with:
-        gitea-server: ${{ gitea.server_url }}
+        RUNNER_TOKEN: ${{ secrets.RUNNER_TOKEN }}
-        repository: ${{ gitea.repository }}
-        token: ${{ secrets.GITEA_TOKEN }}
-  test:
-    needs: cd
-    name: "TEST > 測試專案"
-    runs-on: docker
-    steps:
-    - name: 顯示版本號
-      run: echo ${{ needs.cd.outputs.version }}

action.yaml

@@ -1,13 +1,13 @@
 name: 'CALCULATE VERSION'
 description: '計算版本號'
 author: 'Jeffery'
-# inputs:
+inputs:
-#   RUNNER_TOKEN:
+  IS_BETA:
-#     description: 'Gitea Runner 用來存取的 Token，ex: ${{ secrets.RUNNER_TOKEN }}'
+    description: '是否為 beta 版本'
-#     required: true
+    default: "false"
 outputs:
-  VERSION:
+  version:
-    description: '計算出的新版本號'
+    description: '計算出的版本號'
 runs:
   using: 'docker'
   image: 'Dockerfile'
@@ -15,3 +15,4 @@ runs:
     GITEA_SERVER_URL: ${{ gitea.server_url }}
     GITEA_REPOSITORY: ${{ gitea.repository }}
     RUNNER_TOKEN: ${{ secrets.RUNNER_TOKEN }}
+    IS_BETA: ${{ inputs.IS_BETA }}

entrypoint.sh

@@ -15,6 +15,9 @@ echo "GITEA_REPOSITORY=$GITEA_REPOSITORY" && ([ -z "$GITEA_REPOSITORY" ] || [ "$
 # 顯示 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 "=================================================="
 
 echo "取得最新的版本號"
@@ -24,6 +27,7 @@ echo "--------------------------------------------------"
 # 組合 RELEASE_URL 參數，並顯示出來
 RELEASE_URL="$GITEA_SERVER_URL/api/v1/repos/$GITEA_REPOSITORY/releases" && echo "RELEASE_URL=$RELEASE_URL"
 
+# 檢查是否為空或 "null"
 if [ -n "$RUNNER_TOKEN" ] && [ "$RUNNER_TOKEN" != "null" ]; then
     # 組合 RELEASE_HEADER 參數，並顯示出來
     RELEASE_HEADER="Authorization: token $RUNNER_TOKEN" && echo "RELEASE_HEADER=$RELEASE_HEADER"
@@ -70,8 +74,23 @@ PATCH=$((PATCH + 1))
 # 組合新的版本號
 NEW_VERSION="$MAJOR.$MINOR.$PATCH"
 
-# 確保 GITHUB_OUTPUT 檔案的目錄存在
+# 如果是 beta 版本，計算 beta 編號
-mkdir -p "$(dirname "$GITHUB_OUTPUT")"
+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 "=================================================="