diff --git a/Jenkinsfile b/Jenkinsfile index fb22f84..b76009e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,10 @@ pipeline { TAIGA_PROJECT_ID = '2' TAIGA_URL = 'https://taiga.grigowashere.ru' GITEA_OWNER = 'Grigo' - GITEA_REPO = 'Testing' + GITEA_REPO = 'TestingAndroidBuild' // Замените на нужный репозиторий + GITEA_URL = 'https://git.grigowashere.ru' // Базовый URL Gitea + GITEA_API_URL = "${GITEA_URL}/api/v1" + GITEA_TOKEN_CREDENTIALS_ID = 'Gitea_Credentials' // ID ваших креденшлов для Gitea в Jenkins } stages { @@ -33,16 +36,15 @@ pipeline { steps { unstash 'apk' - withCredentials([string(credentialsId: 'Gitea_Credentials', variable: 'GITEA_TOKEN')]) { + withCredentials([string(credentialsId: "${env.GITEA_TOKEN_CREDENTIALS_ID}", variable: 'GITEA_TOKEN')]) { writeFile file: 'gitea-release.sh', text: ''' #!/bin/bash apkPath="build/outputs/apk/debug/app-debug.apk" - headers="Authorization: token $GITEA_TOKEN" -# Create the release on Gitea -release=$(curl -X POST "https://git.grigowashere.ru/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/releases" \ +# Создаем релиз на Gitea +release=$(curl -X POST "${GITEA_API_URL}/repos/$GITEA_OWNER/$GITEA_REPO/releases" \ -H "$headers" \ -H "Content-Type: application/json" \ -d '{ @@ -56,10 +58,10 @@ release=$(curl -X POST "https://git.grigowashere.ru/api/v1/repos/$GITEA_OWNER/$G releaseId=$(echo $release | jq -r .id) -# Form URL for uploading APK asset -uploadUrl="https://git.grigowashere.ru/api/v1/repos/$GITEA_OWNER/$GITEA_REPO/releases/$releaseId/assets?name=app-debug.apk" +# Формируем URL для загрузки APK +uploadUrl="${GITEA_API_URL}/repos/$GITEA_OWNER/$GITEA_REPO/releases/$releaseId/assets?name=app-debug.apk" -# Upload APK file to Gitea +# Загружаем APK файл в Gitea curl -X POST "$uploadUrl" \ -H "$headers" \ -F "attachment=@$apkPath;type=application/vnd.android.package-archive" @@ -165,8 +167,7 @@ try: print(f"Commented Taiga TG-{ref} ({label}), HTTP {r.status}") except Exception as e: print(f"Taiga comment warning: {e}") - -raise SystemExit(0) + raise SystemExit(0) PY """.stripIndent()) }