From b76cdb6f94950dab3c2bc1ea1516c9e93a25c885 Mon Sep 17 00:00:00 2001 From: EnotAdmin Date: Mon, 5 May 2025 18:46:49 +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 | 35 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/.woodpecker/sync-releases.yaml b/.woodpecker/sync-releases.yaml index dd8b3db..5c48f33 100644 --- a/.woodpecker/sync-releases.yaml +++ b/.woodpecker/sync-releases.yaml @@ -1,4 +1,4 @@ -# .woodpecker/sync-releases.yml +# .woodpecker/sync-releases.yaml when: event: cron @@ -8,7 +8,7 @@ when: steps: - name: sync_releases - image: alpine/git + image: debian:stable-slim # <-- ИЗМЕНЕН ОБРАЗ environment: GITEA_TOKEN: from_secret: gitea_token @@ -18,21 +18,20 @@ steps: from_secret: gitea_url REPO_LIST_FILE: repos_to_sync.txt commands: - # 1. Установка зависимостей - - apk update && apk add curl jq bash + # 1. Установка зависимостей с помощью apt-get + # Добавляем -y для автоматического подтверждения + - apt-get update && apt-get install -y curl jq bash # <-- ИЗМЕНЕНА КОМАНДА УСТАНОВКИ - # 2. Запуск скрипта синхронизации + # 2. Запуск скрипта синхронизации (логика остается прежней) + # Убедимся, что используем #!/bin/bash - | #!/bin/bash - set -e # Останавливаться при ошибках - set -x # ЗАКОММЕНТИРУЙТЕ ЭТО ПОСЛЕ ОТЛАДКИ! + set -e + set -x # ОСТАВЬТЕ ДЛЯ ПЕРВОГО ЗАПУСКА echo "Starting release sync..." - - # --- Конфигурация --- REPO_FILE="${REPO_LIST_FILE:-repos_to_sync.txt}" - # Проверки переменных 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!"; exit 1; fi if [ ! -f "$REPO_FILE" ]; then echo "Error: Repository list file '$REPO_FILE' not found!"; exit 1; fi @@ -40,9 +39,9 @@ steps: echo "Raw Gitea URL from secret: $GITEA_URL" GITEA_AUTH_HEADER="Authorization: token ${GITEA_TOKEN}" - # ИСПРАВЛЕНИЕ 1 (Возврат к echo | sed): Формируем API URL + # Используем echo | sed для совместимости 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 # Проверка осталась + 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,19 +49,19 @@ 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" 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}" # Отладка + 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; } - # --- Основной цикл (с отладочными 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 @@ -72,13 +71,13 @@ steps: echo "-------------------------------------"; echo "Syncing: $GITHUB_REPO_PATH -> $GITEA_REPO_PATH" FETCH_GITEA_URL="${GITEA_API_URL}/repos/${GITEA_REPO_PATH}/releases" - echo "DEBUG: Fetch Gitea Releases URL: ${FETCH_GITEA_URL}" # Отладка + echo "DEBUG: Fetch Gitea Releases URL: ${FETCH_GITEA_URL}" 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 "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; } @@ -88,7 +87,7 @@ steps: 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 "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; }