feat: 移除多餘的變數

This reverts commit 49839e72a0.

action.yml

@@ -39,7 +39,7 @@ runs:
     
     - name: 清理舊映像
       id: cleanup-images
-      if: ${{ inputs.package-name != '' }}
+      if: inputs.package-name != ''
       shell: bash
       run: |
         chmod +x "${{ github.action_path }}/cleanup-images.sh"

cleanup-images.sh

@@ -1,13 +1,20 @@
 #!/bin/bash
 
-set -e
+set -euo pipefail
 
 GITEA_SERVER="$1"
 REPOSITORY="$2"
 PACKAGE_NAME="$3"
 TOKEN="$4"
 KEEP_COUNT="$5"
-DRY_RUN="$6"
+DRY_RUN="${6:-false}"
+
+# 參數驗證
+if [[ -z "$GITEA_SERVER" ]] || [[ -z "$REPOSITORY" ]] || [[ -z "$PACKAGE_NAME" ]] || [[ -z "$TOKEN" ]] || [[ -z "$KEEP_COUNT" ]]; then
+  echo "❌ 錯誤：缺少必要參數"
+  echo "使用方式: $0 <gitea-server> <repository> <package-name> <token> <keep-count> [dry-run]"
+  exit 1
+fi
 
 echo "開始清理舊映像，保留最新 $KEEP_COUNT 個版本"
 
@@ -18,26 +25,35 @@ echo "Owner: $OWNER"
 echo "Package: $PACKAGE_NAME"
 
 # 獲取所有 container 版本並按創建時間排序
-VERSIONS_JSON=$(curl -s "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME" \
-  -H "Authorization: token $TOKEN" \
+echo "正在獲取映像版本列表..."
+VERSIONS_JSON=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+  "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME?token=$TOKEN" \
   -H "Accept: application/json")
 
+HTTP_STATUS=$(echo "$VERSIONS_JSON" | grep -o "HTTP_STATUS:[0-9]*" | cut -d: -f2)
+VERSIONS_JSON=$(echo "$VERSIONS_JSON" | sed '/HTTP_STATUS:/d')
+
 # 檢查是否成功獲取版本列表
-if [ $? -ne 0 ] || [ -z "$VERSIONS_JSON" ]; then
-  echo "錯誤：無法獲取 container 版本列表"
+if [[ "$HTTP_STATUS" != "200" ]] || [[ -z "$VERSIONS_JSON" ]] || [[ "$VERSIONS_JSON" == "null" ]]; then
+  echo "❌ 錯誤：無法獲取 container 版本列表 (HTTP Status: $HTTP_STATUS)"
   exit 1
 fi
 
 # 獲取並排序所有版本 (按創建時間降序)
-SORTED_VERSIONS=$(echo "$VERSIONS_JSON" | jq '.versions | sort_by(.created_at) | reverse')
+SORTED_VERSIONS=$(echo "$VERSIONS_JSON" | jq -e 'sort_by(.created_at) | reverse')
+
+if [[ $? -ne 0 ]]; then
+  echo "❌ 錯誤：無法解析版本資料"
+  exit 1
+fi
 
 # 計算總數量
 TOTAL_COUNT=$(echo "$SORTED_VERSIONS" | jq 'length')
 echo "目前總共有 $TOTAL_COUNT 個映像版本"
 
 # 如果總數量小於等於保留數量，則無需清理
-if [ $TOTAL_COUNT -le $KEEP_COUNT ]; then
-  echo "映像數量 ($TOTAL_COUNT) 未超過保留數量 ($KEEP_COUNT)，無需清理"
+if [[ $TOTAL_COUNT -le $KEEP_COUNT ]]; then
+  echo "✅ 映像數量 ($TOTAL_COUNT) 未超過保留數量 ($KEEP_COUNT)，無需清理"
   exit 0
 fi
 
@@ -46,62 +62,64 @@ DELETE_COUNT=$((TOTAL_COUNT - KEEP_COUNT))
 echo "需要刪除 $DELETE_COUNT 個舊映像"
 
 # 獲取要刪除的版本 (跳過前 keep-count 個)
-TO_DELETE=$(echo "$SORTED_VERSIONS" | jq -r ".[$KEEP_COUNT:] | .[] | {id: .id, name: .name, created_at: .created_at}")
+TO_DELETE=$(echo "$SORTED_VERSIONS" | jq -c ".[$KEEP_COUNT:][]")
 
-# 初始化刪除計數器和列表
+# 初始化刪除計數器
 DELETED_COUNT=0
-DELETED_LIST="[]"
 
 # 處理每個要刪除的版本
-echo "$TO_DELETE" | jq -c '.' | while read -r version; do
-  if [ -z "$version" ] || [ "$version" = "null" ]; then
+while IFS= read -r version; do
+  if [[ -z "$version" ]] || [[ "$version" == "null" ]]; then
     continue
   fi
   
   VERSION_ID=$(echo "$version" | jq -r '.id')
-  VERSION_NAME=$(echo "$version" | jq -r '.name')
+  VERSION_NAME=$(echo "$version" | jq -r '.version')
   CREATED_AT=$(echo "$version" | jq -r '.created_at')
   
-  if [ -z "$VERSION_ID" ] || [ "$VERSION_ID" = "null" ]; then
+  if [[ -z "$VERSION_ID" ]] || [[ "$VERSION_ID" == "null" ]]; then
     continue
   fi
   
   echo "準備刪除: ID=$VERSION_ID, Version=$VERSION_NAME, Created=$CREATED_AT"
   
-  if [ "$DRY_RUN" = "true" ]; then
+  if [[ "$DRY_RUN" == "true" ]]; then
     echo "🔍 [模擬執行] 會刪除映像版本: $VERSION_NAME (ID: $VERSION_ID)"
     DELETED_COUNT=$((DELETED_COUNT + 1))
   else
     # 實際刪除
-    DELETE_RESPONSE=$(curl -s -w "HTTP_STATUS:%{http_code}" \
-      -X DELETE "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME/$VERSION_ID" \
-      -H "Authorization: token $TOKEN")
+    DELETE_RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+      -X DELETE "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME/$VERSION_ID?token=$TOKEN" \
+      -H "Accept: application/json")
     
-    HTTP_STATUS=$(echo "$DELETE_RESPONSE" | grep -o "HTTP_STATUS:[0-9]*" | cut -d: -f2)
+    DELETE_HTTP_STATUS=$(echo "$DELETE_RESPONSE" | grep -o "HTTP_STATUS:[0-9]*" | cut -d: -f2)
     
-    if [ "$HTTP_STATUS" = "204" ] || [ "$HTTP_STATUS" = "200" ]; then
+    if [[ "$DELETE_HTTP_STATUS" == "204" ]] || [[ "$DELETE_HTTP_STATUS" == "200" ]]; then
       echo "✅ 成功刪除映像版本: $VERSION_NAME (ID: $VERSION_ID)"
       DELETED_COUNT=$((DELETED_COUNT + 1))
-      
-      # 更新已刪除列表
-      DELETED_LIST=$(echo "$DELETED_LIST" | jq ". + [{\"id\": \"$VERSION_ID\", \"version\": \"$VERSION_NAME\", \"created_at\": \"$CREATED_AT\"}]")
     else
-      echo "❌ 刪除失敗映像版本: $VERSION_NAME (ID: $VERSION_ID), HTTP狀態: $HTTP_STATUS"
+      echo "❌ 刪除失敗映像版本: $VERSION_NAME (ID: $VERSION_ID), HTTP狀態: $DELETE_HTTP_STATUS"
     fi
   fi
-done
+done <<< "$TO_DELETE"
 
-# 由於 while 迴圈在子 shell 中執行，需要重新計算
-if [ "$DRY_RUN" = "true" ]; then
-  FINAL_DELETE_COUNT=$(echo "$TO_DELETE" | jq -s 'length')
-  echo "🔍 [模擬執行] 總共會刪除 $FINAL_DELETE_COUNT 個映像版本"
+# 輸出最終結果
+echo ""
+echo "========================================="
+if [[ "$DRY_RUN" == "true" ]]; then
+  echo "🔍 [模擬執行] 總共會刪除 $DELETED_COUNT 個映像版本"
+  echo "✅ 模擬執行完成"
 else
-  # 重新獲取並計算實際刪除的數量
-  NEW_VERSIONS_JSON=$(curl -s "$GITEA_SERVER/api/v1/packages/$OWNER/container/$PACKAGE_NAME" \
-    -H "Authorization: token $TOKEN" \
-    -H "Accept: application/json")
-  NEW_TOTAL_COUNT=$(echo "$NEW_VERSIONS_JSON" | jq '.versions | length')
-  ACTUAL_DELETED=$((TOTAL_COUNT - NEW_TOTAL_COUNT))
+  echo "✅ 清理完成，成功刪除了 $DELETED_COUNT 個映像版本"
   
-  echo "✅ 清理完成，實際刪除了 $ACTUAL_DELETED 個映像版本"
+  # 驗證結果
+  if [[ $DELETED_COUNT -gt 0 ]]; then
+    echo ""
+    echo "正在驗證剩餘映像數量..."
+    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）"
+  fi
 fi
+echo "========================================="

cleanup-releases.sh

@@ -1,33 +1,52 @@
 #!/bin/bash
 
-set -e
+set -euo pipefail
 
 GITEA_SERVER="$1"
 REPOSITORY="$2"
 TOKEN="$3"
 KEEP_COUNT="$4"
-DRY_RUN="$5"
+DRY_RUN="${5:-false}"
 
-echo "開始清理舊版本，保留最新 $KEEP_COUNT 個版本"
-
-# 獲取所有 releases 並按創建時間排序
-RELEASES_JSON=$(curl -s "$GITEA_SERVER/api/v1/repos/$REPOSITORY/releases" \
-  -H "Authorization: token $TOKEN" \
-  -H "Accept: application/json")
-
-# 檢查是否成功獲取 releases
-if [ $? -ne 0 ] || [ -z "$RELEASES_JSON" ]; then
-  echo "錯誤：無法獲取 releases 列表"
+# 參數驗證
+if [[ -z "$GITEA_SERVER" ]] || [[ -z "$REPOSITORY" ]] || [[ -z "$TOKEN" ]] || [[ -z "$KEEP_COUNT" ]]; then
+  echo "❌ 錯誤：缺少必要參數"
+  echo "使用方式: $0 <gitea-server> <repository> <token> <keep-count> [dry-run]"
   exit 1
 fi
 
-# 計算總數量
-TOTAL_COUNT=$(echo "$RELEASES_JSON" | jq 'length')
-echo "目前總共有 $TOTAL_COUNT 個 releases"
+echo "開始清理舊版本，保留最新 $KEEP_COUNT 個版本"
+
+# 獲取所有發佈並按創建時間排序
+echo "正在獲取發佈列表..."
+RELEASES_RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+  "$GITEA_SERVER/api/v1/repos/$REPOSITORY/releases" \
+  -H "Authorization: token $TOKEN" \
+  -H "Accept: application/json")
+
+HTTP_STATUS=$(echo "$RELEASES_RESPONSE" | grep -o "HTTP_STATUS:[0-9]*" | cut -d: -f2)
+RELEASES_JSON=$(echo "$RELEASES_RESPONSE" | sed '/HTTP_STATUS:/d')
+
+# 檢查是否成功獲取發佈
+if [[ "$HTTP_STATUS" != "200" ]] || [[ -z "$RELEASES_JSON" ]] || [[ "$RELEASES_JSON" == "null" ]]; then
+  echo "❌ 錯誤：無法獲取發佈列表 (HTTP Status: $HTTP_STATUS)"
+  exit 1
+fi
+
+# 計算總數量並排序（按創建時間降序，最新的在前）
+SORTED_RELEASES=$(echo "$RELEASES_JSON" | jq -e 'sort_by(.created_at) | reverse')
+
+if [[ $? -ne 0 ]]; then
+  echo "❌ 錯誤：無法解析發佈資料"
+  exit 1
+fi
+
+TOTAL_COUNT=$(echo "$SORTED_RELEASES" | jq 'length')
+echo "目前總共有 $TOTAL_COUNT 個發佈"
 
 # 如果總數量小於等於保留數量，則無需清理
-if [ $TOTAL_COUNT -le $KEEP_COUNT ]; then
-  echo "releases 數量 ($TOTAL_COUNT) 未超過保留數量 ($KEEP_COUNT)，無需清理"
+if [[ $TOTAL_COUNT -le $KEEP_COUNT ]]; then
+  echo "✅ 發佈數量 ($TOTAL_COUNT) 未超過保留數量 ($KEEP_COUNT)，無需清理"
   exit 0
 fi
 
@@ -35,63 +54,68 @@ fi
 DELETE_COUNT=$((TOTAL_COUNT - KEEP_COUNT))
 echo "需要刪除 $DELETE_COUNT 個舊版本"
 
-# 獲取要刪除的 releases (跳過前 keep-count 個)
-TO_DELETE=$(echo "$RELEASES_JSON" | jq -r ".[$KEEP_COUNT:] | .[] | {id: .id, tag: .tag_name, name: .name}")
+# 獲取要刪除的發佈（跳過前 keep-count 個）
+TO_DELETE=$(echo "$SORTED_RELEASES" | jq -c ".[$KEEP_COUNT:]")
 
-# 初始化刪除計數器和列表
+# 初始化刪除計數器
 DELETED_COUNT=0
-DELETED_LIST="[]"
+FAILED_COUNT=0
 
-# 處理每個要刪除的 release
-echo "$TO_DELETE" | jq -c '.' | while read -r release; do
-  if [ -z "$release" ] || [ "$release" = "null" ]; then
+# 處理每個要刪除的發佈
+echo "$TO_DELETE" | jq -c '.[]' | while IFS= read -r release; do
+  if [[ -z "$release" ]] || [[ "$release" == "null" ]]; then
     continue
   fi
   
   RELEASE_ID=$(echo "$release" | jq -r '.id')
-  RELEASE_TAG=$(echo "$release" | jq -r '.tag')
-  RELEASE_NAME=$(echo "$release" | jq -r '.name')
+  RELEASE_TAG=$(echo "$release" | jq -r '.tag_name')
+  RELEASE_NAME=$(echo "$release" | jq -r '.name // "未命名"')
   
-  if [ -z "$RELEASE_ID" ] || [ "$RELEASE_ID" = "null" ]; then
+  if [[ -z "$RELEASE_ID" ]] || [[ "$RELEASE_ID" == "null" ]]; then
     continue
   fi
   
-  echo "準備刪除: ID=$RELEASE_ID, Tag=$RELEASE_TAG, Name=$RELEASE_NAME"
-  
-  if [ "$DRY_RUN" = "true" ]; then
-    echo "🔍 [模擬執行] 會刪除 release: $RELEASE_TAG ($RELEASE_NAME)"
-    DELETED_COUNT=$((DELETED_COUNT + 1))
+  if [[ "$DRY_RUN" == "true" ]]; then
+    echo "🔍 [模擬執行] 會刪除發佈: $RELEASE_TAG ($RELEASE_NAME)"
   else
     # 實際刪除
-    DELETE_RESPONSE=$(curl -s -w "HTTP_STATUS:%{http_code}" \
+    DELETE_RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
       -X DELETE "$GITEA_SERVER/api/v1/repos/$REPOSITORY/releases/$RELEASE_ID" \
       -H "Authorization: token $TOKEN")
     
     HTTP_STATUS=$(echo "$DELETE_RESPONSE" | grep -o "HTTP_STATUS:[0-9]*" | cut -d: -f2)
     
-    if [ "$HTTP_STATUS" = "204" ] || [ "$HTTP_STATUS" = "200" ]; then
-      echo "✅ 成功刪除 release: $RELEASE_TAG ($RELEASE_NAME)"
-      DELETED_COUNT=$((DELETED_COUNT + 1))
-      
-      # 更新已刪除列表
-      DELETED_LIST=$(echo "$DELETED_LIST" | jq ". + [{\"id\": \"$RELEASE_ID\", \"tag\": \"$RELEASE_TAG\", \"name\": \"$RELEASE_NAME\"}]")
+    if [[ "$HTTP_STATUS" == "204" ]] || [[ "$HTTP_STATUS" == "200" ]]; then
+      echo "✅ 成功刪除發佈: $RELEASE_TAG ($RELEASE_NAME)"
     else
-      echo "❌ 刪除失敗 release: $RELEASE_TAG ($RELEASE_NAME), HTTP狀態: $HTTP_STATUS"
+      echo "❌ 刪除失敗發佈: $RELEASE_TAG ($RELEASE_NAME), HTTP 狀態: $HTTP_STATUS"
     fi
   fi
 done
 
-# 由於 while 迴圈在子 shell 中執行，需要重新計算
-if [ "$DRY_RUN" = "true" ]; then
-  FINAL_DELETE_COUNT=$(echo "$TO_DELETE" | jq -s 'length')
-  echo "🔍 [模擬執行] 總共會刪除 $FINAL_DELETE_COUNT 個版本"
+# 輸出最終結果
+if [[ "$DRY_RUN" == "true" ]]; then
+  echo ""
+  echo "🔍 [模擬執行] 總共會刪除 $DELETE_COUNT 個版本"
+  echo "✅ 模擬執行完成"
 else
   # 重新獲取並計算實際刪除的數量
-  NEW_RELEASES_JSON=$(curl -s "$GITEA_SERVER/api/v1/repos/$REPOSITORY/releases" \
+  echo ""
+  echo "正在驗證刪除結果..."
+  NEW_RELEASES_RESPONSE=$(curl -s -w "\nHTTP_STATUS:%{http_code}" \
+    "$GITEA_SERVER/api/v1/repos/$REPOSITORY/releases" \
     -H "Authorization: token $TOKEN" \
     -H "Accept: application/json")
-  NEW_TOTAL_COUNT=$(echo "$NEW_RELEASES_JSON" | jq 'length')
-  ACTUAL_DELETED=$((TOTAL_COUNT - NEW_TOTAL_COUNT))
   
-  echo "✅ 清理完成，實際刪除了 $ACTUAL_DELETED 個版本"
+  NEW_HTTP_STATUS=$(echo "$NEW_RELEASES_RESPONSE" | grep -o "HTTP_STATUS:[0-9]*" | cut -d: -f2)
+  NEW_RELEASES_JSON=$(echo "$NEW_RELEASES_RESPONSE" | sed '/HTTP_STATUS:/d')
+  
+  if [[ "$NEW_HTTP_STATUS" == "200" ]] && [[ -n "$NEW_RELEASES_JSON" ]]; then
+    NEW_TOTAL_COUNT=$(echo "$NEW_RELEASES_JSON" | jq 'length')
+    ACTUAL_DELETED=$((TOTAL_COUNT - NEW_TOTAL_COUNT))
+    echo "✅ 清理完成！實際刪除了 $ACTUAL_DELETED 個版本"
+    echo "📊 目前剩餘 $NEW_TOTAL_COUNT 個發佈"
+  else
+    echo "✅ 清理完成（無法驗證最終數量）"
+  fi
 fi