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

.gitea/workflows/master.yaml

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

action.yaml

@@ -1,23 +1,13 @@
 name: 'CALCULATE VERSION'
 description: '計算版本號'
 author: 'Jeffery'
-# inputs:
-#   RUNNER_TOKEN:
-#     description: 'Gitea Runner 用來存取的 Token，ex: ${{ secrets.RUNNER_TOKEN }}'
-#     required: true
 outputs:
   version:
-    description: '計算出的新版本號'
+    description: '計算出的版本號'
-    value: ${{ steps.calculate.outputs.version }}
 runs:
   using: 'docker'
   image: 'Dockerfile'
   env:
     GITEA_SERVER_URL: ${{ gitea.server_url }}
     GITEA_REPOSITORY: ${{ gitea.repository }}
-    RUNNER_TOKEN: ${{ secrets.RUNNER_TOKEN }}
+    RUNNER_TOKEN: ${{ secrets.RUNNER_TOKEN }}
-  using: 'composite'
-  steps:
-  - name: 將檔案寫到輸出
-    id: calculate
-    run: echo "VERSION.txt" >> $GITHUB_OUTPUT

entrypoint.sh

@@ -24,6 +24,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"
@@ -71,4 +72,6 @@ PATCH=$((PATCH + 1))
 NEW_VERSION="$MAJOR.$MINOR.$PATCH" && echo "NEW_VERSION=$NEW_VERSION"
 
 # 將版本輸出到環境變數
-echo "version=$NEW_VERSION" >> "VERSION.txt"
+echo "version=$NEW_VERSION" >> $GITHUB_OUTPUT
+
+echo "=================================================="