From b0c2d567f30f9c4a060067d500e44d60b393f8c8 Mon Sep 17 00:00:00 2001 From: EnotAdmin Date: Mon, 5 May 2025 18:42:40 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20.woodpecker/sync-releases.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/sync-releases.yaml | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/.woodpecker/sync-releases.yaml b/.woodpecker/sync-releases.yaml index 0907bcb..dd8b3db 100644 --- a/.woodpecker/sync-releases.yaml +++ b/.woodpecker/sync-releases.yaml @@ -1,4 +1,4 @@ -# .woodpecker/sync-releases.yaml +# .woodpecker/sync-releases.yml when: event: cron @@ -40,9 +40,9 @@ steps: echo "Raw Gitea URL from secret: $GITEA_URL" GITEA_AUTH_HEADER="Authorization: token ${GITEA_TOKEN}" - # ИСПРАВЛЕНИЕ 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 + # ИСПРАВЛЕНИЕ 1 (Возврат к echo | sed): Формируем API URL + GITEA_BASE_URL=$(echo "${GITEA_URL}" | sed 's|/api/v1$||; s|/*$||') + 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 "Calculated Gitea API URL: ${GITEA_API_URL}" @@ -50,7 +50,7 @@ steps: if [ -n "$GITHUB_TOKEN" ]; then GITHUB_AUTH_HEADER="Authorization: token ${GITHUB_TOKEN}"; fi 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 $?; } upload_asset() { local repo="$1"; local id="$2"; local file="$3" @@ -62,17 +62,15 @@ steps: local status=$?; if [ $status -eq 0 ]; then rm "$file"; fi; return $status; } - # --- Основной цикл --- + # --- Основной цикл (с отладочными URL) --- 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: Формируем URL для curl в отдельной переменной + отладка FETCH_GITEA_URL="${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases" echo "DEBUG: Fetch Gitea Releases URL: ${FETCH_GITEA_URL}" # Отладка echo "Fetching Gitea releases..."; @@ -85,12 +83,10 @@ steps: 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[]') - 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..."; @@ -98,7 +94,6 @@ steps: 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