更新 .gitea/workflows/master.yaml

.gitea/workflows/master.yaml

@@ -11,17 +11,17 @@ jobs:
     steps:
     - name: 計算版本號
       id: version
-      uses: https://gitea.jsc.idv.tw/jiantw83/calculate-version-action@v${{ vars.CALCULATE_VERSION }}
+      uses: https://gitea.jsc.idv.tw/actions/calculate-version@${{ vars.ACTION_CALCULATE_VERSION }}
       with:
         gitea-server: ${{ gitea.server_url }}
         repository: ${{ gitea.repository }}
         token: ${{ secrets.GITEA_TOKEN }}
     - name: 發布專案
-      uses: akkuman/gitea-release-action@v1
+      uses: akkuman/gitea-release-action@${{ vars.ACTION_RELEASE_VERSION }}
       with:
         tag_name: "v${{ steps.version.outputs.VERSION }}"
     - name: 清理舊版本 (保留最新2個)
-      uses: https://gitea.jsc.idv.tw/jiantw83/cleanup-release-action@v${{ vars.CLEANUP_RELEASE_VERSION }}
+      uses: https://gitea.jsc.idv.tw/actions/cleanup-release@${{ vars.ACTION_CLEANUP_RELEASE_VERSION }}
       with:
         gitea-server: ${{ gitea.server_url }}
         repository: ${{ gitea.repository }}

cleanup-images.sh

@@ -64,9 +64,9 @@ echo "需要刪除 $DELETE_COUNT 個舊映像"
 # 獲取要刪除的版本 (跳過前 keep-count 個)
 TO_DELETE=$(echo "$SORTED_VERSIONS" | jq -c ".[$KEEP_COUNT:][]")
 
-# 初始化刪除計數器和列表
+# 初始化刪除計數器
 DELETED_COUNT=0
-declare -a DELETED_VERSIONS
+FAILED_COUNT=0
 
 # 處理每個要刪除的版本
 while IFS= read -r version; do
@@ -87,11 +87,10 @@ while IFS= read -r version; do
   if [[ "$DRY_RUN" == "true" ]]; then
     echo "🔍 [模擬執行] 會刪除映像版本: $VERSION_NAME (ID: $VERSION_ID)"
     DELETED_COUNT=$((DELETED_COUNT + 1))
-    DELETED_VERSIONS+=("$VERSION_NAME")
   else
     # 實際刪除
     DELETE_RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
-      -X DELETE "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME/$VERSION_ID?token=$TOKEN" \
+      -X DELETE "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME/$VERSION_NAME?token=$TOKEN" \
       -H "Accept: application/json")
     
     DELETE_HTTP_STATUS=$(echo "$DELETE_RESPONSE" | grep -o "HTTP_STATUS:[0-9]*" | cut -d: -f2)
@@ -99,28 +98,28 @@ while IFS= read -r version; do
     if [[ "$DELETE_HTTP_STATUS" == "204" ]] || [[ "$DELETE_HTTP_STATUS" == "200" ]]; then
       echo "✅ 成功刪除映像版本: $VERSION_NAME (ID: $VERSION_ID)"
       DELETED_COUNT=$((DELETED_COUNT + 1))
-      DELETED_VERSIONS+=("$VERSION_NAME")
     else
       echo "❌ 刪除失敗映像版本: $VERSION_NAME (ID: $VERSION_ID), HTTP狀態: $DELETE_HTTP_STATUS"
+      FAILED_COUNT=$((FAILED_COUNT + 1))
     fi
   fi
 done <<< "$TO_DELETE"
 
+# 檢查是否有刪除失敗的情況
+if [[ $FAILED_COUNT -gt 0 ]]; then
+  echo ""
+  echo "❌ 錯誤：有 $FAILED_COUNT 個映像版本刪除失敗"
+  exit 1
+fi
+
 # 輸出最終結果
 echo ""
 echo "========================================="
 if [[ "$DRY_RUN" == "true" ]]; then
   echo "🔍 [模擬執行] 總共會刪除 $DELETED_COUNT 個映像版本"
-  if [[ ${#DELETED_VERSIONS[@]} -gt 0 ]]; then
-    echo "待刪除版本列表:"
-    printf '  - %s\n' "${DELETED_VERSIONS[@]}"
-  fi
+  echo "✅ 模擬執行完成"
 else
   echo "✅ 清理完成，成功刪除了 $DELETED_COUNT 個映像版本"
-  if [[ ${#DELETED_VERSIONS[@]} -gt 0 ]]; then
-    echo "已刪除版本列表:"
-    printf '  - %s\n' "${DELETED_VERSIONS[@]}"
-  fi
   
   # 驗證結果
   if [[ $DELETED_COUNT -gt 0 ]]; then
@@ -129,7 +128,7 @@ else
     VERIFY_JSON=$(curl -s "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME?token=$TOKEN" \
       -H "Accept: application/json")
     NEW_TOTAL_COUNT=$(echo "$VERIFY_JSON" | jq 'length')
-    echo "目前剩餘 $NEW_TOTAL_COUNT 個映像版本（預期: $KEEP_COUNT）"
+    echo "📊 目前剩餘 $NEW_TOTAL_COUNT 個映像版本（預期: $KEEP_COUNT）"
   fi
 fi
 echo "========================================="

cleanup-releases.sh

@@ -89,10 +89,18 @@ echo "$TO_DELETE" | jq -c '.[]' | while IFS= read -r release; do
       echo "✅ 成功刪除發佈: $RELEASE_TAG ($RELEASE_NAME)"
     else
       echo "❌ 刪除失敗發佈: $RELEASE_TAG ($RELEASE_NAME), HTTP 狀態: $HTTP_STATUS"
+      FAILED_COUNT=$((FAILED_COUNT + 1))
     fi
   fi
 done
 
+# 檢查是否有刪除失敗的情況
+if [[ $FAILED_COUNT -gt 0 ]]; then
+  echo ""
+  echo "❌ 錯誤：有 $FAILED_COUNT 個發佈刪除失敗"
+  exit 1
+fi
+
 # 輸出最終結果
 if [[ "$DRY_RUN" == "true" ]]; then
   echo ""