Merge pull request #17 from dexoron/master

master -> dev
2026-10-21 09:58:35 +00:00 · 2026-06-07 21:17:14 +08:00
parent c8cb155e5a 595b7ac105
commit 4daca925a0
4 changed files with 61 additions and 55 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -41,10 +41,6 @@ on:
        description: "Publish to crates.io"
        type: boolean
        default: false
-      run_snap:
-        description: "Publish to Snap Store (dcrup)"
-        type: boolean
-        default: false
      run_brew:
        description: "Update Homebrew tap"
        type: boolean
@@ -83,24 +79,40 @@ jobs:
  notes:
    needs: setup
    runs-on: ubuntu-latest
+    outputs:
+      release_name: ${{ steps.extract.outputs.release_name }}
    steps:
      - uses: actions/checkout@v4
        with:
          ref: ${{ needs.setup.outputs.tag }}

      - name: Prepare Release Notes
+        id: extract
        shell: bash
        run: |
          set -euo pipefail
          tag="${{ needs.setup.outputs.version }}"
          notes_file=".github/release-notes.md"
          if grep -q "^## \\[${tag}\\]" CHANGELOG.md; then
+            # Extract release name from header: ## [0.7.1] - 2026-06-02 "Title"
+            release_name=$(awk -v ver="$tag" '
+              $0 ~ "^## \\[" ver "\\]" {
+                match($0, /"([^"]+)"/, arr)
+                if (arr[1] != "") {
+                  print "v" ver " - " arr[1]
+                } else {
+                  print "v" ver
+                }
+              }
+            ' CHANGELOG.md)
+            echo "release_name=${release_name}" >> "$GITHUB_OUTPUT"
            awk -v ver="$tag" '
              $0 ~ "^## \\[" ver "\\]" {found=1; next}
              found && $0 ~ "^## \\[" {exit}
              found {print}
            ' CHANGELOG.md | sed -e '${/^$/d;}' > "$notes_file"
          else
+            echo "release_name=v${tag}" >> "$GITHUB_OUTPUT"
            echo "No CHANGELOG section for $tag." > "$notes_file"
            git log -1 --pretty=format:"%s%n%n%b" >> "$notes_file"
          fi
@@ -126,6 +138,7 @@ jobs:
        uses: softprops/action-gh-release@v2
        with:
          tag_name: ${{ needs.setup.outputs.tag }}
+          name: ${{ needs.notes.outputs.release_name }}
          body_path: .github/release-notes.md
          prerelease: ${{ needs.setup.outputs.prerelease == 'true' }}

@@ -651,6 +664,8 @@ jobs:
            done
          }
          PKG
+
+          cat > packages/aur/dcr/.SRCINFO <<SRC
          pkgbase = dcr
            pkgdesc = Cargo-like utility to manage C/C++ projects
            pkgver = ${PKGVER_CLEAN}
@@ -1229,34 +1244,11 @@ jobs:
          git commit -m "dcr ${{ needs.setup.outputs.version }}"
          git push
  
-  # ── Snap Store (dcrup) ─────────────────────────────────────────────────────
-  publish-snap:
-    if: |
-      (github.event_name == 'push' && needs.setup.outputs.prerelease == 'false') ||
-      (github.event_name == 'workflow_dispatch' && github.event.inputs.run_snap == 'true')
-    needs: [setup, build-linux-packages]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Download Built Packages
-        uses: actions/download-artifact@v4
-        with:
-          name: snap-package
-          path: dist-packages
-
-      - name: Resolve Snap File
-        id: snap-file
-        run: |
-          snap_file=$(ls dist-packages/*.snap 2>/dev/null | head -1)
-          if [ -z "$snap_file" ]; then
-            echo "No .snap file found in dist-packages/"
-            exit 1
-          fi
-          echo "snap=$snap_file" >> "$GITHUB_OUTPUT"
-
-      - name: Publish to Snap Store
-        uses: snapcore/action-publish@v1
-        env:
-          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
-        with:
-          snap: ${{ steps.snap-file.outputs.snap }}
-          release: stable
+  # ── Snap Store (dcrup) — temporarily disabled ────────────────────────────
+  # Classic confinement was denied for this project (too new).
+  # Snap artifact is still built and attached to the release via
+  # publish-dexoron-packages. Users can install manually:
+  #   sudo snap install --classic --dangerous dcrup_*.snap
+  #
+  # publish-snap:
+  #   if: ...
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 - Оптимизация сборки: `opt-level = "z"`, LTO, `codegen-units = 1`, `panic = "abort"`, `strip = true`.
 - Поддержка новых архитектур (i686, armv7, riscv64gc, aarch64) в рабочих процессах и установочных скриптах.
 - Сборка пакетов `deb` и `rpm` для всех 5 архитектур Linux через `cargo-zigbuild`.
- Пакеты AUR (`dcr-dev`, `dcr-dev-bin`) и публикация Snap в CI.
+- Пакеты AUR (`dcr-dev`, `dcr-dev-bin`) и сборка Snap в CI.

 **Изменено:**
 - Функция `validate_package_name` стала публичной.
@@ -20,6 +20,15 @@
 - Инструкция в README изменена с `| bash` на `| sh` для POSIX.
 - Отключена архитектура Windows 32-bit (GNU) из-за проблем со сборкой.

+**Исправлено:**
+
+- **`dcr new <invalid-name>` создаёт директорию, затем падает** — валидация теперь происходит до операций с файлами.
+- **`dcr init` создаёт dcr.toml, затем падает при невалидном имени директории** — то же исправление.
+- **Man-страницы отсутствовали после установки** — теперь устанавливаются через скрипты установки, пакетные менеджеры и Homebrew.
+- **Ложное срабатывание на букву диска в Windows** — в парсинге файлов зависимостей.
+- **CRLF `\r\n` ломает парсер зависимостей** — теперь обрабатываются смешанные окончания строк.
+- **Новая строка после обратного слеша не поглощалась** — в обработке escape-последовательностей `parse_d_file`.
+
 ### EN

 **Added:**
@@ -30,7 +39,7 @@
 - Release profile optimizations (`opt-level = "z"`, LTO, `codegen-units = 1`, `panic = "abort"`, `strip = true`).
 - Linux i686, armv7, riscv64gc, aarch64 architecture support in release workflows and installation scripts.
 - Multi-arch `deb` and `rpm` package builds for all 5 Linux architectures via `cargo-zigbuild`.
- AUR packages (`dcr-dev`, `dcr-dev-bin`) and automated Snapcraft publishing in CI.
+- AUR packages (`dcr-dev`, `dcr-dev-bin`) and Snap build in CI.

 **Changed:**
 - `validate_package_name` made public and callable from CLI commands directly.
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -81,6 +81,9 @@ vendored = [
 git2 = "0.20.4"
 openssl = "0.10"

+[target.'cfg(windows)'.dependencies]
+git2 = "0.20.4"
+
 [profile.release]
 opt-level = "z"
 lto = "thin"
--- a/README.md
+++ b/README.md
@@ -1,22 +1,21 @@
-<div align="center">
+<h1 align="center">DCR — Dexoron Cargo Realization</h1>

-# DCR — Dexoron Cargo Realization
+<p align="center"><strong>A Cargo-style build tool for C/C++ projects</strong></p>

-**A Cargo-style build tool for C/C++ projects**
+<p align="center">
+  <a href="https://github.com/dexoron/dcr/actions/workflows/ci.yml"><img alt="CI" src="https://github.com/dexoron/dcr/actions/workflows/ci.yml/badge.svg"></a>
+  <a href="https://github.com/dexoron/dcr/releases/latest"><img alt="GitHub Release" src="https://img.shields.io/github/v/release/dexoron/dcr"></a>
+  <a href="https://github.com/dexoron/dcr/releases"><img alt="Platform" src="https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey"></a>
+  <br>
+  <a href="https://aur.archlinux.org/packages/dcr"><img alt="AUR" src="https://img.shields.io/aur/version/dcr"></a>
+  <a href="https://crates.io/crates/dcr"><img alt="Crates.io" src="https://img.shields.io/crates/v/dcr"></a>
+  <a href="https://github.com/dexoron/homebrew-dexoron"><img alt="Homebrew" src="https://img.shields.io/badge/homebrew-dexoron%2Fdexoron-orange"></a>
+  <br>
+  <a href="https://github.com/dexoron/dcr/stargazers"><img alt="GitHub Stars" src="https://img.shields.io/github/stars/dexoron/dcr?style=flat"></a>
+  <a href="LICENSE"><img alt="License: GPL-3.0" src="https://img.shields.io/badge/License-GPL--3.0-blue.svg"></a>
+</p>

-[![CI](https://github.com/dexoron/dcr/actions/workflows/ci.yml/badge.svg)](https://github.com/dexoron/dcr/actions/workflows/ci.yml)
-[![GitHub Release](https://img.shields.io/github/v/release/dexoron/dcr)](https://github.com/dexoron/dcr/releases/latest)
-[![Platform](https://img.shields.io/badge/platform-linux%20%7C%20macos%20%7C%20windows-lightgrey)](https://github.com/dexoron/dcr/releases)
-<br/>
-[![AUR](https://img.shields.io/aur/version/dcr)](https://aur.archlinux.org/packages/dcr)
-[![Crates.io](https://img.shields.io/crates/v/dcr)](https://crates.io/crates/dcr)
-[![Homebrew](https://img.shields.io/badge/homebrew-dexoron%2Fdexoron-orange)](https://github.com/dexoron/homebrew-dexoron)
-[![Snap](https://img.shields.io/badge/snap-dcrup-orange)](https://snapcraft.io/dcrup)
-<br/>
-[![GitHub Stars](https://img.shields.io/github/stars/dexoron/dcr?style=flat)](https://github.com/dexoron/dcr/stargazers)
-[![License: GPL-3.0](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](LICENSE)
-
-</div>
+<!-- Snap badge removed: classic confinement was denied for this project. -->

 ---

@@ -127,8 +126,11 @@ curl -fsSL https://dcr.dexoron.su/install_bsd.sh | sh
 <td><b>Snap (Linux)</b></td>
 <td>

+> Snap Store publishing temporarily disabled — see [#51671](https://forum.snapcraft.io/t/classic-confinement-request-for-dcrup/51671).
+> Download the `.snap` from [GitHub Releases](https://github.com/dexoron/dcr/releases/latest) and install manually:
+
 ```sh
-sudo snap install dcrup
+sudo snap install --classic --dangerous dcrup_*.snap
 ```

 </td>
@@ -226,7 +228,7 @@ other in [docs/](docs/), `dcr --help` and `dcr <command> --help`
 | Linux (Musl)    | ✅ | ✅ | ✅ | ✅ | 🚧 |
 | macOS           | ✅ | ✅ | ❌ | ❌ | ❌ |
 | Windows (MSVC)  | ✅ | ✅ | ❌ | ✅ | ❌ |
-| Windows (MinGW) | ✅ | 🚧 | ❌ | ✅ | ❌ |
+| Windows (MinGW) | ✅ | 🚧 | ❌ | ❌ | ❌ |
 | FreeBSD         | ✅ | 🚧 | ❌ | ❌ | ❌ |
 | OpenBSD         | ✅ | 🚧 | ❌ | ❌ | ❌ |
 | NetBSD          | ✅ | 🚧 | ❌ | ❌ | ❌ |