Merge pull request 'feat: 使用新版本' (#25) from develop into master

Reviewed-on: #25

.gitea/workflows/master.yaml

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

action.yaml

@@ -1,9 +1,13 @@
 name: 'CALCULATE VERSION'
 description: '計算版本號'
 author: 'Jeffery'
+# inputs:
+#   RUNNER_TOKEN:
+#     description: 'Gitea Runner 用來存取的 Token，ex: ${{ secrets.RUNNER_TOKEN }}'
+#     required: true
 outputs:
-  version:
+  VERSION:
-    description: '計算出的版本號'
+    description: '計算出的新版本號'
 runs:
   using: 'docker'
   image: 'Dockerfile'

entrypoint.sh

@@ -24,7 +24,6 @@ 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"
@@ -68,10 +67,8 @@ PATCH=$((PATCH + 1))
 # 如果 MINOR >= 10，重置為 0 並增加 MAJOR 版本
 [ $MINOR -ge 10 ] && { MINOR=0; MAJOR=$((MAJOR + 1)); }
 
-# 組合新的版本號，並顯示
+# 組合新的版本號
-NEW_VERSION="$MAJOR.$MINOR.$PATCH" && echo "NEW_VERSION=$NEW_VERSION"
+NEW_VERSION="$MAJOR.$MINOR.$PATCH"
 
 # 將版本輸出到環境變數
 echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
-
-echo "=================================================="