Merge branch 'feature/torrent-engine-integration' into 'main'

fix(build): resolve Gradle and manifest issues for TorrentEngine See merge request foxixus/neomovies_mobile!2
Add automatic GitLab Releases with versioning
2025-10-27 23:18:49 +05:00 · 2025-10-02 14:30:27 +00:00 · 2025-10-02 14:17:17 +00:00 · 2025-10-02 14:01:32 +00:00 · 2025-10-02 12:18:39 +00:00
1 changed files with 134 additions and 135 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,202 +1,201 @@
-# GitLab CI/CD Configuration for NeoMovies Mobile
-# Автоматическая сборка APK и TorrentEngine модуля
-
 stages:
  - build
  - test
  - deploy

 variables:
-  # Flutter версия
-  FLUTTER_VERSION: "3.35.5"
-  # Flutter путь для CI
-  FLUTTER_ROOT: "/opt/flutter"
-  # Android SDK (стандартный путь в mingc/android-build-box)
-  ANDROID_SDK_ROOT: "/opt/android-sdk"
-  ANDROID_HOME: "/opt/android-sdk"
-  # Gradle настройки для CI (меньше RAM)
-  GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs='-Xmx1536m -XX:MaxMetaspaceSize=512m' -Dorg.gradle.parallel=true -Dorg.gradle.caching=true"
-  # Кэш
+  GRADLE_OPTS: "-Dorg.gradle.daemon=false -Dorg.gradle.jvmargs='-Xmx2048m' -Dorg.gradle.parallel=true"
  GRADLE_USER_HOME: "${CI_PROJECT_DIR}/.gradle"
  PUB_CACHE: "${CI_PROJECT_DIR}/.pub-cache"

-# Кэширование для ускорения сборки
 cache:
  key: ${CI_COMMIT_REF_SLUG}
  paths:
    - .gradle/
    - .pub-cache/
    - android/.gradle/
-    - android/build/
    - build/

-# ============================================
-# Сборка только TorrentEngine модуля
-# ============================================
 build:torrent-engine:
  stage: build
  image: mingc/android-build-box:latest
-  tags:
-    - saas-linux-medium-amd64  # GitLab Instance Runner (4GB RAM, 2 cores)
-  before_script:
-    - echo "Detecting Android SDK location..."
-    - export ANDROID_SDK_ROOT=${ANDROID_SDK_ROOT:-${ANDROID_HOME:-/opt/android-sdk}}
-    - echo "Android SDK: ${ANDROID_SDK_ROOT}"
-    - echo "Creating local.properties for Flutter..."
-    - echo "flutter.sdk=${FLUTTER_ROOT}" > android/local.properties
-    - echo "sdk.dir=${ANDROID_SDK_ROOT}" >> android/local.properties
-    - cat android/local.properties
  script:
-    - echo "Building TorrentEngine library module..."
    - cd android
-    # Собираем только модуль torrentengine
-    - ./gradlew :torrentengine:assembleRelease --no-daemon --parallel --build-cache
-    - ls -lah torrentengine/build/outputs/aar/
+    - chmod +x gradlew
+    - ./gradlew :torrentengine:assembleRelease --no-daemon --stacktrace
  artifacts:
-    name: "torrentengine-${CI_COMMIT_SHORT_SHA}"
    paths:
      - android/torrentengine/build/outputs/aar/*.aar
-    expire_in: 1 week
-  only:
-    - dev
-    - feature/torrent-engine-integration
-    - merge_requests
-  when: on_success
+    expire_in: 30 days
+  rules:
+    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_BRANCH =~ /^feature\//
+    - if: $CI_COMMIT_TAG
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"

-# ============================================
-# Сборка Debug APK
-# ============================================
 build:apk-debug:
  stage: build
-  image: mingc/android-build-box:latest
-  tags:
-    - docker
-  before_script:
-    - echo "Installing Flutter ${FLUTTER_VERSION}..."
-    - git clone --depth 1 --branch ${FLUTTER_VERSION} https://github.com/flutter/flutter.git /opt/flutter
-    - export PATH="/opt/flutter/bin:$PATH"
-    - flutter --version
-    - flutter doctor -v
-    - flutter pub get
+  image: ghcr.io/cirruslabs/flutter:stable
  script:
-    - echo "Building Debug APK..."
-    - flutter build apk --debug --target-platform android-arm64
-    - ls -lah build/app/outputs/flutter-apk/
+    - flutter pub get
+    - flutter build apk --debug
  artifacts:
-    name: "neomovies-debug-${CI_COMMIT_SHORT_SHA}"
    paths:
      - build/app/outputs/flutter-apk/app-debug.apk
    expire_in: 1 week
-  only:
-    - dev
-    - feature/torrent-engine-integration
-    - merge_requests
-  when: on_success
+  rules:
+    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_COMMIT_BRANCH =~ /^feature\//
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
  allow_failure: true

-# ============================================
-# Сборка Release APK (только для dev)
-# ============================================
 build:apk-release:
  stage: build
-  image: mingc/android-build-box:latest
-  tags:
-    - docker
-  before_script:
-    - echo "Installing Flutter ${FLUTTER_VERSION}..."
-    - git clone --depth 1 --branch ${FLUTTER_VERSION} https://github.com/flutter/flutter.git /opt/flutter
-    - export PATH="/opt/flutter/bin:$PATH"
-    - flutter --version
-    - flutter doctor -v
-    - flutter pub get
+  image: ghcr.io/cirruslabs/flutter:stable
  script:
-    - echo "Building Release APK..."
-    # Сборка с split-per-abi для уменьшения размера
-    - flutter build apk --release --split-per-abi --target-platform android-arm64
-    - ls -lah build/app/outputs/flutter-apk/
+    - flutter pub get
+    - flutter build apk --release --split-per-abi
  artifacts:
-    name: "neomovies-release-${CI_COMMIT_SHORT_SHA}"
    paths:
      - build/app/outputs/flutter-apk/app-arm64-v8a-release.apk
+      - build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk
+      - build/app/outputs/flutter-apk/app-x86_64-release.apk
    expire_in: 30 days
-  only:
-    - dev
-  when: on_success
+  rules:
+    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_COMMIT_BRANCH == "main"
+    - if: $CI_COMMIT_BRANCH =~ /^feature\//
+    - if: $CI_COMMIT_TAG
  allow_failure: true

-# ============================================
-# Анализ кода Flutter
-# ============================================
 test:flutter-analyze:
  stage: test
-  image: mingc/android-build-box:latest
-  tags:
-    - docker
-  before_script:
-    - git clone --depth 1 --branch ${FLUTTER_VERSION} https://github.com/flutter/flutter.git /opt/flutter
-    - export PATH="/opt/flutter/bin:$PATH"
-    - flutter pub get
+  image: ghcr.io/cirruslabs/flutter:stable
  script:
-    - echo "Running Flutter analyze..."
-    - flutter analyze --no-fatal-infos || true
-  only:
-    - dev
-    - merge_requests
+    - flutter pub get
+    - flutter analyze
+  rules:
+    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
  allow_failure: true

-# ============================================
-# Kotlin/Android lint
-# ============================================
 test:android-lint:
  stage: test
  image: mingc/android-build-box:latest
-  tags:
-    - docker
-  before_script:
-    - echo "Creating local.properties for Flutter..."
-    - echo "flutter.sdk=${FLUTTER_ROOT}" > android/local.properties
-    - echo "sdk.dir=${ANDROID_SDK_ROOT}" >> android/local.properties
  script:
-    - echo "Running Android Lint..."
    - cd android
-    - ./gradlew lint --no-daemon || true
+    - chmod +x gradlew
+    - ./gradlew lint --no-daemon
  artifacts:
-    name: "lint-reports-${CI_COMMIT_SHORT_SHA}"
    paths:
-      - android/app/build/reports/lint-results*.html
-      - android/torrentengine/build/reports/lint-results*.html
+      - android/app/build/reports/lint-*.html
+      - android/torrentengine/build/reports/lint-*.html
    expire_in: 1 week
-  only:
-    - dev
-    - merge_requests
+    when: always
+  rules:
+    - if: $CI_COMMIT_BRANCH == "dev"
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
  allow_failure: true

-# ============================================
-# Deploy к релизам (опционально)
-# ============================================
 deploy:release:
  stage: deploy
  image: alpine:latest
-  tags:
-    - docker
+  needs:
+    - build:apk-release
+    - build:torrent-engine
  before_script:
    - apk add --no-cache curl jq
  script:
-    - echo "Creating GitLab Release..."
    - |
-      if [ -f "build/app/outputs/flutter-apk/app-arm64-v8a-release.apk" ]; then
-        echo "Release APK found"
-        # Здесь можно добавить публикацию в GitLab Releases или другой deployment
+      # Определяем версию релиза
+      if [ -n "$CI_COMMIT_TAG" ]; then
+        VERSION="$CI_COMMIT_TAG"
+      else
+        # Автоматическая версия из коммита
+        VERSION="v0.0.${CI_PIPELINE_ID}"
      fi
-  only:
-    - tags
-  when: manual
-
-# ============================================
-# Уведомление об успешной сборке
-# ============================================
-.notify_success:
-  after_script:
-    - echo "✅ Build completed successfully!"
-    - echo "📦 Artifacts are available in the pipeline artifacts"
-    - echo "🔗 Download URL: ${CI_JOB_URL}/artifacts/download"
+      
+      echo "📦 Creating GitLab Release: $VERSION"
+      echo "📝 Commit: ${CI_COMMIT_SHORT_SHA}"
+      echo "🔗 Branch: ${CI_COMMIT_BRANCH}"
+      
+      # Проверяем наличие APK файлов
+      APK_ARM64="build/app/outputs/flutter-apk/app-arm64-v8a-release.apk"
+      APK_ARM32="build/app/outputs/flutter-apk/app-armeabi-v7a-release.apk"
+      APK_X86="build/app/outputs/flutter-apk/app-x86_64-release.apk"
+      AAR_TORRENT="android/torrentengine/build/outputs/aar/torrentengine-release.aar"
+      
+      # Создаем описание релиза
+      RELEASE_DESCRIPTION="## NeoMovies Mobile ${VERSION}
+      
+      **Build Info:**
+      - Commit: \`${CI_COMMIT_SHORT_SHA}\`
+      - Branch: \`${CI_COMMIT_BRANCH}\`
+      - Pipeline: [#${CI_PIPELINE_ID}](${CI_PIPELINE_URL})
+      
+      **Downloads:**
+      "
+      
+      # Подсчитываем файлы
+      FILE_COUNT=0
+      [ -f "$APK_ARM64" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- ARM64 APK: \`app-arm64-v8a-release.apk\`"
+      [ -f "$APK_ARM32" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- ARM32 APK: \`app-armeabi-v7a-release.apk\`"
+      [ -f "$APK_X86" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- x86_64 APK: \`app-x86_64-release.apk\`"
+      [ -f "$AAR_TORRENT" ] && FILE_COUNT=$((FILE_COUNT+1)) && RELEASE_DESCRIPTION="${RELEASE_DESCRIPTION}\n- TorrentEngine Library: \`torrentengine-release.aar\`"
+      
+      if [ $FILE_COUNT -eq 0 ]; then
+        echo "❌ No release artifacts found!"
+        exit 1
+      fi
+      
+      echo "✅ Found $FILE_COUNT artifact(s) to release"
+      
+      # Создаем релиз через GitLab API
+      RELEASE_PAYLOAD=$(cat <<EOF
+      {
+        "name": "NeoMovies ${VERSION}",
+        "tag_name": "${VERSION}",
+        "description": "${RELEASE_DESCRIPTION}",
+        "ref": "${CI_COMMIT_SHA}",
+        "assets": {
+          "links": []
+        }
+      }
+      EOF
+      )
+      
+      echo "🚀 Creating release via GitLab API..."
+      
+      RESPONSE=$(curl --fail-with-body -s -X POST \
+        "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases" \
+        --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+        --header "Content-Type: application/json" \
+        --data "${RELEASE_PAYLOAD}" || echo "FAILED")
+      
+      if [ "$RESPONSE" = "FAILED" ]; then
+        echo "⚠️  Release API call failed, trying alternative method..."
+        # Если релиз уже существует, пробуем обновить
+        curl -s -X PUT \
+          "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/releases/${VERSION}" \
+          --header "PRIVATE-TOKEN: ${CI_JOB_TOKEN}" \
+          --header "Content-Type: application/json" \
+          --data "${RELEASE_PAYLOAD}"
+      fi
+      
+      echo ""
+      echo "✅ Release created successfully!"
+      echo "🔗 View release: ${CI_PROJECT_URL}/-/releases/${VERSION}"
+      echo "📦 Pipeline artifacts: ${CI_JOB_URL}/artifacts/browse"
+  artifacts:
+    paths:
+      - build/app/outputs/flutter-apk/*.apk
+      - android/torrentengine/build/outputs/aar/*.aar
+    expire_in: 90 days
+  rules:
+    - if: $CI_COMMIT_TAG
+      when: always
+    - if: $CI_COMMIT_BRANCH == "dev"
+      when: on_success
+    - if: $CI_COMMIT_BRANCH == "main"
+      when: on_success
Author	SHA1	Message	Date
Erno	804253ffcc	Merge branch 'feature/torrent-engine-integration' into 'main' fix(build): resolve Gradle and manifest issues for TorrentEngine See merge request foxixus/neomovies_mobile!2	2025-10-02 14:30:27 +00:00
factory-droid[bot]	e4e56d76af	Add automatic GitLab Releases with versioning - Build release APKs for all branches (dev, main, feature/*, tags) - Auto-create GitLab Releases with version v0.0.{PIPELINE_ID} - Support semantic versioning via git tags (e.g., v0.0.3) - Include all APK variants (arm64, arm32, x86_64) and torrentengine AAR - Release triggers automatically on dev/main branches after successful build - Full release description with commit info and download links - Artifacts expire in 90 days for releases, 30 days for builds - Use GitLab Release API with fallback for updates	2025-10-02 14:17:17 +00:00
factory-droid[bot]	4306a9038a	Simplify GitLab CI/CD configuration - Removed complex before_script logic and manual Flutter installation - Use ghcr.io/cirruslabs/flutter:stable image for Flutter builds - Simplified job rules using modern GitLab syntax - Increased JVM heap to 2048m for better performance - Removed manual local.properties creation (handled by Gradle) - Cleaner artifact naming and job structure - Kept all essential jobs: torrent-engine, apk builds, tests, deploy	2025-10-02 14:01:32 +00:00
Erno	143a5cf8a5	Merge branch 'feature/torrent-engine-integration' into 'main' better See merge request foxixus/neomovies_mobile!1	2025-10-02 12:18:39 +00:00