Обновить .woodpecker/sync-releases.yaml

.woodpecker/sync-releases.yaml

@@ -25,7 +25,7 @@ steps:
       - |
         #!/bin/bash
         set -e # Останавливаться при ошибках
-        set -x # Оставьте закомментированным для нормальной работы, раскомментируйте ТОЛЬКО для отладки
+        set -x # ЗАКОММЕНТИРУЙТЕ ЭТО ПОСЛЕ ОТЛАДКИ!
 
         echo "Starting release sync..."
 
@@ -33,16 +33,18 @@ steps:
         REPO_FILE="${REPO_LIST_FILE:-repos_to_sync.txt}"
 
         # Проверки переменных
-        if [ -z "$GITEA_URL" ]; then echo "Error: GITEA_URL was not injected from secret 'gitea_url'!"; exit 1; fi
+        if [ -z "$GITEA_URL" ]; then echo "Error: GITEA_URL was not injected!"; exit 1; fi
-        if [ -z "$GITEA_TOKEN" ]; then echo "Error: GITEA_TOKEN was not injected from secret 'gitea_token'!"; exit 1; fi
+        if [ -z "$GITEA_TOKEN" ]; then echo "Error: GITEA_TOKEN was not injected!"; exit 1; fi
         if [ ! -f "$REPO_FILE" ]; then echo "Error: Repository list file '$REPO_FILE' not found!"; exit 1; fi
 
-        echo "Using Gitea URL: $GITEA_URL"
+        echo "Raw Gitea URL from secret: $GITEA_URL"
         GITEA_AUTH_HEADER="Authorization: token ${GITEA_TOKEN}"
-        # ИСПРАВЛЕНИЕ 1: Формируем API URL, обрабатывая ПЕРЕМЕННУЮ $GITEA_URL
+
-        GITEA_BASE_URL=$(echo "${GITEA_URL}" | sed 's|/api/v1$||; s|/*$||')
+        # ИСПРАВЛЕНИЕ 1: Формируем API URL с помощью sed и here-string
+        GITEA_BASE_URL=$(sed 's|/api/v1$||; s|/*$||' <<< "${GITEA_URL}")
+        if [ -z "$GITEA_BASE_URL" ]; then echo "Error: Failed to calculate GITEA_BASE_URL!"; exit 1; fi
         GITEA_API_URL="${GITEA_BASE_URL}/api/v1"
-        echo "Using Gitea API URL: ${GITEA_API_URL}" # Используем {} для ясности
+        echo "Calculated Gitea API URL: ${GITEA_API_URL}"
 
         GITHUB_AUTH_HEADER=""
         if [ -n "$GITHUB_TOKEN" ]; then GITHUB_AUTH_HEADER="Authorization: token ${GITHUB_TOKEN}"; fi
@@ -50,33 +52,53 @@ steps:
 
         # --- Вспомогательные функции ---
         download_asset() { local url="$1"; local filename="$2"; echo "Downloading asset: $filename"; curl -L -H "$GITHUB_AUTH_HEADER" -o "$filename" "$url"; return $?; }
-        # ИСПРАВЛЕНИЕ 2.1: Корректный URL в upload_asset
+        upload_asset() {
-        upload_asset() { local repo="$1"; local id="$2"; local file="$3"; echo "Uploading asset: $file"; UPLOAD_URL="${GITEA_API_URL}/repos/${repo}/releases/${id}/assets?name=$(basename "$file")"; curl -sf --fail -X POST -H "$GITEA_AUTH_HEADER" -H "Content-Type: application/octet-stream" --data-binary "@$file" "$UPLOAD_URL"; local status=$?; if [ $status -eq 0 ]; then rm "$file"; fi; return $status; }
+          local repo="$1"; local id="$2"; local file="$3"
+          local filename_basename=$(basename "$file")
+          echo "Uploading asset: $file (as $filename_basename)"
+          local TARGET_URL="${GITEA_API_URL}/repos/${repo}/releases/${id}/assets?name=${filename_basename}"
+          echo "DEBUG: Upload Asset URL: ${TARGET_URL}" # Отладка
+          curl -sf --fail -X POST -H "$GITEA_AUTH_HEADER" -H "Content-Type: application/octet-stream" --data-binary "@$file" "${TARGET_URL}"
+          local status=$?; if [ $status -eq 0 ]; then rm "$file"; fi; return $status;
+        }
 
         # --- Основной цикл ---
         echo "Reading repository list from $REPO_FILE"
         while IFS= read -r repo_pair || [[ -n "$repo_pair" ]]; do
+          # ... (пропуск пустых строк и комментариев без изменений) ...
           if [[ -z "$repo_pair" || "$repo_pair" == \#* ]]; then continue; fi
           if ! echo "$repo_pair" | grep -q ':'; then echo "Warning: Skipping invalid line: $repo_pair"; continue; fi
 
           GITHUB_REPO_PATH=$(echo "$repo_pair" | cut -d':' -f1); GITEA_REPO_PATH=$(echo "$repo_pair" | cut -d':' -f2)
           echo "-------------------------------------"; echo "Syncing: $GITHUB_REPO_PATH -> $GITEA_REPO_PATH"
 
-          # ИСПРАВЛЕНИЕ 2.2: Корректный URL для получения релизов Gitea
+          # ИСПРАВЛЕНИЕ 2: Формируем URL для curl в отдельной переменной + отладка
-          echo "Fetching Gitea releases..."; GITEA_RELEASES_JSON=$(curl -sf --fail -H "$GITEA_AUTH_HEADER" "${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases") || { echo "Error Gitea fetch: $GITEA_REPO_PATH"; continue; }; EXISTING_GITEA_TAGS=$(echo "$GITEA_RELEASES_JSON" | jq -r '.[].tag_name')
+          FETCH_GITEA_URL="${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases"
-          # ИСПРАВЛЕНИЕ 2.3: Корректный URL для получения релизов GitHub (просто для консистентности)
+          echo "DEBUG: Fetch Gitea Releases URL: ${FETCH_GITEA_URL}" # Отладка
-          echo "Fetching GitHub releases..."; GITHUB_RELEASES_JSON=$(curl -sf --fail -H "$GITHUB_AUTH_HEADER" "${GITHUB_API_URL}/repos/${GITHUB_REPO_PATH}/releases?per_page=20") || { echo "Error GitHub fetch: $GITHUB_REPO_PATH"; continue; }
+          echo "Fetching Gitea releases...";
+          GITEA_RELEASES_JSON=$(curl -sf --fail -H "$GITEA_AUTH_HEADER" "${FETCH_GITEA_URL}") || { echo "Error Gitea fetch: $GITEA_REPO_PATH"; continue; }
+          EXISTING_GITEA_TAGS=$(echo "$GITEA_RELEASES_JSON" | jq -r '.[].tag_name')
+
+          FETCH_GITHUB_URL="${GITHUB_API_URL}/repos/${GITHUB_REPO_PATH}/releases?per_page=20"
+          echo "DEBUG: Fetch GitHub Releases URL: ${FETCH_GITHUB_URL}" # Отладка
+          echo "Fetching GitHub releases...";
+          GITHUB_RELEASES_JSON=$(curl -sf --fail -H "$GITHUB_AUTH_HEADER" "${FETCH_GITHUB_URL}") || { echo "Error GitHub fetch: $GITHUB_REPO_PATH"; continue; }
 
           echo "$GITHUB_RELEASES_JSON" | jq -c '.[] | select(.draft == false)' | tac | while IFS= read -r release_json; do
+            # ... (извлечение данных релиза без изменений) ...
             TAG_NAME=$(echo "$release_json" | jq -r '.tag_name')
             if echo "$EXISTING_GITEA_TAGS" | grep -q -x -F "$TAG_NAME"; then continue; fi
-
             echo ">>> New release: $TAG_NAME"; RELEASE_NAME=$(echo "$release_json" | jq -r '.name'); RELEASE_BODY=$(echo "$release_json" | jq -r '.body // ""'); IS_PRERELEASE=$(echo "$release_json" | jq -r '.prerelease'); ASSETS=$(echo "$release_json" | jq -c '.assets[]')
 
-            # ИСПРАВЛЕНИЕ 2.4: Корректный URL для создания релиза Gitea
+
-            echo "Creating Gitea release $TAG_NAME..."; CREATE_PAYLOAD=$(jq -n --arg t "$TAG_NAME" --arg n "$RELEASE_NAME" --arg b "$RELEASE_BODY" --argjson p "$IS_PRERELEASE" '{tag_name:$t, name:$n, body:$b, prerelease:$p}'); GITEA_NEW_RELEASE_JSON=$(curl -sf --fail -X POST -H "$GITEA_AUTH_HEADER" -H "Content-Type: application/json" -d "$CREATE_PAYLOAD" "${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases") || { echo "Error creating Gitea release $TAG_NAME (maybe tag not synced?). Skipping."; continue; }
+            CREATE_GITEA_URL="${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases"
+            echo "DEBUG: Create Gitea Release URL: ${CREATE_GITEA_URL}" # Отладка
+            echo "Creating Gitea release $TAG_NAME...";
+            CREATE_PAYLOAD=$(jq -n --arg t "$TAG_NAME" --arg n "$RELEASE_NAME" --arg b "$RELEASE_BODY" --argjson p "$IS_PRERELEASE" '{tag_name:$t, name:$n, body:$b, prerelease:$p}')
+            GITEA_NEW_RELEASE_JSON=$(curl -sf --fail -X POST -H "$GITEA_AUTH_HEADER" -H "Content-Type: application/json" -d "$CREATE_PAYLOAD" "${CREATE_GITEA_URL}") || { echo "Error creating Gitea release $TAG_NAME (maybe tag not synced?). Skipping."; continue; }
             GITEA_RELEASE_ID=$(echo "$GITEA_NEW_RELEASE_JSON" | jq -r '.id'); echo "Gitea release ID: $GITEA_RELEASE_ID"
 
+            # ... (обработка ассетов с отладкой URL внутри upload_asset) ...
             UPLOAD_FAILED_COUNT=0
             if [ -n "$ASSETS" ]; then
               echo "$ASSETS" | while IFS= read -r asset_json; do