ci: align release flow with version tags

.github/workflows/release.yml

@@ -1,14 +1,10 @@
-# Release: сборка артефактов → единая публикация с git-cliff и SHA256SUMS.
-# Триггер: git tag v0.1.0 && git push origin v0.1.0
-#
-# Рекомендуемые коммиты: Conventional Commits (feat:, fix:, …) — см. cliff.toml
+# Release: ручной запуск сборки артефактов и публикация релиза с тегом v<version>.
+# Триггер: Actions -> Release -> Run workflow
 
 name: Release
 
 on:
-  push:
-    tags:
-      - 'v*'
+  workflow_dispatch:
 
 permissions:
   contents: write
@@ -21,9 +17,24 @@ jobs:
   build-windows:
     name: Build Windows
     runs-on: windows-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
+      full_version: ${{ steps.version.outputs.full_version }}
+      build_number: ${{ steps.version.outputs.build_number }}
     steps:
       - uses: actions/checkout@v4
 
+      - name: Get version from pubspec.yaml
+        id: version
+        shell: bash
+        run: |
+          FULL_VERSION=$(grep "^version:" pubspec.yaml | sed 's/version: //')
+          VERSION=$(echo "$FULL_VERSION" | sed 's/+.*//')
+          BUILD_NUMBER=$(echo "$FULL_VERSION" | sed 's/.*+//')
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+          echo "full_version=$FULL_VERSION" >> "$GITHUB_OUTPUT"
+          echo "build_number=$BUILD_NUMBER" >> "$GITHUB_OUTPUT"
+
       - name: Setup Flutter
         uses: subosito/flutter-action@v2
         with:
@@ -39,22 +50,31 @@ jobs:
 
       - name: Zip Windows artifact
         run: |
-          $tag = "${{ github.ref_name }}"
+          $tag = "v${{ steps.version.outputs.version }}"
           $dir = "build\windows\x64\runner\Release"
           Compress-Archive -Path "$dir\*" -DestinationPath "Querya-Desktop-$tag-windows.zip"
 
       - uses: actions/upload-artifact@v4
         with:
           name: bundle-windows
-          path: Querya-Desktop-${{ github.ref_name }}-windows.zip
+          path: Querya-Desktop-v${{ steps.version.outputs.version }}-windows.zip
           if-no-files-found: error
 
   build-linux:
     name: Build Linux
     runs-on: ubuntu-latest
+    outputs:
+      version: ${{ steps.version.outputs.version }}
     steps:
       - uses: actions/checkout@v4
 
+      - name: Get version from pubspec.yaml
+        id: version
+        run: |
+          FULL_VERSION=$(grep "^version:" pubspec.yaml | sed 's/version: //')
+          VERSION=$(echo "$FULL_VERSION" | sed 's/+.*//')
+          echo "version=$VERSION" >> "$GITHUB_OUTPUT"
+
       - name: Install Linux dependencies
         run: |
           sudo apt-get update
@@ -76,12 +96,12 @@ jobs:
       - name: Zip Linux artifact
         run: |
           cd build/linux/x64/release/bundle
-          zip -r "${GITHUB_WORKSPACE}/Querya-Desktop-${{ github.ref_name }}-linux.zip" .
+          zip -r "${GITHUB_WORKSPACE}/Querya-Desktop-v${{ steps.version.outputs.version }}-linux.zip" .
 
       - uses: actions/upload-artifact@v4
         with:
           name: bundle-linux
-          path: Querya-Desktop-${{ github.ref_name }}-linux.zip
+          path: Querya-Desktop-v${{ steps.version.outputs.version }}-linux.zip
           if-no-files-found: error
 
   publish:
@@ -93,10 +113,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: taiki-e/install-action@v2
-        with:
-          tool: git-cliff@2.11.0
-
       - uses: actions/download-artifact@v4
         with:
           path: artifacts
@@ -112,37 +128,25 @@ jobs:
           cd dist
           sha256sum *.zip | tee SHA256SUMS.txt
 
-      - name: Generate changelog (git-cliff + GitHub API)
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_REPO: ${{ github.repository }}
-        run: |
-          set -euo pipefail
-          TAG="${{ github.ref_name }}"
-          # Текст страницы релиза: без глобального header из cliff.toml
-          git-cliff --latest \
-            --config cliff.toml \
-            --strip header \
-            --github-token "$GITHUB_TOKEN" \
-            --github-repo "$GITHUB_REPO" \
-            -o release-body.md
-          # Вложение: полный фрагмент с header (удобно архивировать / копировать в docs)
-          git-cliff --latest \
-            --config cliff.toml \
-            --github-token "$GITHUB_TOKEN" \
-            --github-repo "$GITHUB_REPO" \
-            -o "CHANGELOG-${TAG}.md"
-
       - name: Create GitHub Release
         uses: softprops/action-gh-release@v2
         with:
-          tag_name: ${{ github.ref_name }}
-          name: Release ${{ github.ref_name }}
-          body_path: release-body.md
+          tag_name: v${{ needs.build-windows.outputs.version }}
+          name: Release v${{ needs.build-windows.outputs.version }}
+          body: |
+            ## Querya Desktop v${{ needs.build-windows.outputs.version }}
+
+            ### Downloads
+            - **Linux**: Querya-Desktop-v${{ needs.build-windows.outputs.version }}-linux.zip
+            - **Windows**: Querya-Desktop-v${{ needs.build-windows.outputs.version }}-windows.zip
+
+            ### Build Info
+            - Version: ${{ needs.build-windows.outputs.full_version }}
+            - Build Number: ${{ needs.build-windows.outputs.build_number }}
+            - Commit: ${{ github.sha }}
           fail_on_unmatched_files: true
           files: |
             dist/*.zip
             dist/SHA256SUMS.txt
-            CHANGELOG-${{ github.ref_name }}.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/version-bump.yml

@@ -0,0 +1,76 @@
+name: Auto Version Bump
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - main
+
+jobs:
+  bump-version:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Check if PR was merged
+        id: check
+        run: |
+          if [ "${{ github.event.pull_request.merged }}" = "true" ]; then
+            echo "merged=true" >> "$GITHUB_OUTPUT"
+          else
+            echo "merged=false" >> "$GITHUB_OUTPUT"
+          fi
+
+      - name: Checkout main branch
+        if: steps.check.outputs.merged == 'true'
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get current version
+        if: steps.check.outputs.merged == 'true'
+        id: current_version
+        run: |
+          CURRENT_VERSION=$(grep "^version:" pubspec.yaml | sed 's/version: //' | sed 's/+.*//')
+          BUILD_NUMBER=$(grep "^version:" pubspec.yaml | sed 's/.*+//')
+          echo "current_version=$CURRENT_VERSION" >> "$GITHUB_OUTPUT"
+          echo "current_build=$BUILD_NUMBER" >> "$GITHUB_OUTPUT"
+
+      - name: Bump patch version
+        if: steps.check.outputs.merged == 'true'
+        id: bump
+        run: |
+          CURRENT_VERSION="${{ steps.current_version.outputs.current_version }}"
+          CURRENT_BUILD="${{ steps.current_version.outputs.current_build }}"
+          MAJOR=$(echo "$CURRENT_VERSION" | cut -d. -f1)
+          MINOR=$(echo "$CURRENT_VERSION" | cut -d. -f2)
+          PATCH=$(echo "$CURRENT_VERSION" | cut -d. -f3)
+          NEW_PATCH=$((PATCH + 1))
+          NEW_VERSION="$MAJOR.$MINOR.$NEW_PATCH"
+          if [ -z "$CURRENT_BUILD" ]; then
+            NEW_BUILD=1
+          else
+            NEW_BUILD=$((CURRENT_BUILD + 1))
+          fi
+          echo "new_version=$NEW_VERSION" >> "$GITHUB_OUTPUT"
+          echo "new_build=$NEW_BUILD" >> "$GITHUB_OUTPUT"
+
+      - name: Update pubspec.yaml
+        if: steps.check.outputs.merged == 'true'
+        run: |
+          NEW_VERSION="${{ steps.bump.outputs.new_version }}"
+          NEW_BUILD="${{ steps.bump.outputs.new_build }}"
+          sed -i "s/^version: .*/version: ${NEW_VERSION}+${NEW_BUILD}/" pubspec.yaml
+          grep "^version:" pubspec.yaml
+
+      - name: Commit version bump
+        if: steps.check.outputs.merged == 'true'
+        run: |
+          git config --local user.email "action@github.com"
+          git config --local user.name "GitHub Action"
+          git add pubspec.yaml
+          git commit -m "Bump version to ${{ steps.bump.outputs.new_version }}+${{ steps.bump.outputs.new_build }}"
+          git push origin main