diff --git a/.woodpecker/sync-releases.sh b/.woodpecker/sync-releases.sh index 23b5be1..d2b6423 100644 --- a/.woodpecker/sync-releases.sh +++ b/.woodpecker/sync-releases.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -#set -x # дебаг +# set -x # дебаг echo "Starting release sync..." REPO_FILE="${REPO_LIST_FILE:-repos_to_sync.txt}" @@ -16,8 +16,6 @@ echo "REPO_FILE check: OK ($REPO_FILE)" echo "--- End Variable Checks ---" GITEA_AUTH_HEADER="Authorization: token ${GITEA_TOKEN}" - -# Используем echo | sed для совместимости echo "Calculating GITEA_BASE_URL from GITEA_URL..." GITEA_BASE_URL=$(echo "${GITEA_URL}" | sed 's|/api/v1$||; s|/*$||') if [ -z "$GITEA_BASE_URL" ]; then @@ -34,22 +32,25 @@ GITHUB_API_URL="https://api.github.com" # --- Вспомогательные функции --- download_asset() { local url="$1"; local filename="$2"; echo "Downloading asset: $filename"; curl -L -H "$GITHUB_AUTH_HEADER" -o "$filename" "$url"; return $?; } + +# ИСПРАВЛЕНИЕ 1: Добавляем параметр для оригинального имени upload_asset() { - 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}" + local repo="$1"; local id="$2"; local temp_file_path="$3"; local original_filename="$4" # <-- Новый параметр + echo "Uploading asset: $temp_file_path (as $original_filename)" + # Используем original_filename в параметре ?name= + local TARGET_URL="${GITEA_API_URL}/repos/${repo}/releases/${id}/assets?name=${original_filename}" 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; + # Загружаем содержимое временного файла temp_file_path + curl -sf --fail -X POST -H "$GITEA_AUTH_HEADER" -H "Content-Type: application/octet-stream" --data-binary "@$temp_file_path" "${TARGET_URL}" + local status=$?; if [ $status -eq 0 ]; then rm "$temp_file_path"; fi; return $status; # Удаляем временный файл } # --- Основной цикл --- echo "Reading repository list from $REPO_FILE" while IFS= read -r repo_pair || [[ -n "$repo_pair" ]]; do + # ... (пропуск пустых/комментариев, парсинг GITHUB_REPO_PATH/GITEA_REPO_PATH - без изменений) ... 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" @@ -58,13 +59,11 @@ while IFS= read -r repo_pair || [[ -n "$repo_pair" ]]; do 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') - - # Запрос к GitHub API (возвращаем -sf --fail) + FETCH_GITHUB_URL="${GITHUB_API_URL}/repos/${GITHUB_REPO_PATH}/releases?per_page=20" - echo "DEBUG: Fetch GitHub Releases URL: ${FETCH_GITHUB_URL}" # Отладка URL полезна + 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; } - # --- Конец запроса к GitHub --- 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') @@ -75,18 +74,36 @@ while IFS= read -r repo_pair || [[ -n "$repo_pair" ]]; do 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" + + # Используем простой curl для создания релиза + 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? Check Gitea logs/permissions). Skipping."; continue; } + + GITEA_RELEASE_ID=$(echo "$GITEA_NEW_RELEASE_JSON" | jq -r '.id') + if [ -z "$GITEA_RELEASE_ID" ] || [ "$GITEA_RELEASE_ID" == "null" ]; then + echo "Error: Could not parse release ID from Gitea response: $GITEA_NEW_RELEASE_JSON. Skipping asset upload." + continue + fi + echo "Gitea release ID: $GITEA_RELEASE_ID" UPLOAD_FAILED_COUNT=0 if [ -n "$ASSETS" ]; then echo "$ASSETS" | while IFS= read -r asset_json; do - ASSET_NAME=$(echo "$asset_json" | jq -r '.name'); ASSET_URL=$(echo "$asset_json" | jq -r '.browser_download_url'); TMP_ASSET_FILE="asset_${ASSET_NAME}" - if download_asset "$ASSET_URL" "$TMP_ASSET_FILE"; then if ! upload_asset "$GITEA_REPO_PATH" "$GITEA_RELEASE_ID" "$TMP_ASSET_FILE"; then ((UPLOAD_FAILED_COUNT++)); fi; else echo "Download failed: $ASSET_NAME"; ((UPLOAD_FAILED_COUNT++)); fi + ASSET_NAME=$(echo "$asset_json" | jq -r '.name') # Оригинальное имя + ASSET_URL=$(echo "$asset_json" | jq -r '.browser_download_url') + TMP_ASSET_FILE="asset_${ASSET_NAME}" # Временное имя файла для скачивания + + if download_asset "$ASSET_URL" "$TMP_ASSET_FILE"; then + if ! upload_asset "$GITEA_REPO_PATH" "$GITEA_RELEASE_ID" "$TMP_ASSET_FILE" "$ASSET_NAME"; then + ((UPLOAD_FAILED_COUNT++)) + fi + else + echo "Download failed: $ASSET_NAME"; ((UPLOAD_FAILED_COUNT++)) + fi done else echo "No assets."; fi if [ $UPLOAD_FAILED_COUNT -eq 0 ]; then echo "Release $TAG_NAME sync OK."; else echo "Release $TAG_NAME sync processed, $UPLOAD_FAILED_COUNT asset errors."; fi - done + + done # Конец внутреннего цикла по релизам GitHub echo "Finished: $GITHUB_REPO_PATH -> $GITEA_REPO_PATH"; echo "-------------------------------------" -done < "$REPO_FILE" +done < "$REPO_FILE" # Конец внешнего цикла по репозиториям echo "Release sync finished." \ No newline at end of file