diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7b4a141..1bb3f27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,8 +20,9 @@ jobs: - name: Validate commit message run: | # Get commit message(s) to validate + # Use --no-merges to exclude merge commits (auto-generated by GitHub) if [ "${{ github.event_name }}" = "pull_request" ]; then - COMMITS=$(git log --format=%s origin/${{ github.base_ref }}..HEAD) + COMMITS=$(git log --no-merges --format=%s origin/${{ github.base_ref }}..HEAD) else COMMITS=$(git log -1 --format=%s) fi diff --git a/package.json b/package.json index bcaec3d..05351d9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "markpdfdown", - "version": "0.1.3-tfive", + "version": "0.1.5-tone", "description": "A high-quality PDF to Markdown tool based on large language model visual recognition.", "author": "MarkPDFdown", "main": "dist/main/index.js", @@ -103,11 +103,13 @@ "prettier --write" ] }, + "optionalDependencies": { + "electron": "^35.0.2" + }, "dependencies": { "@ant-design/icons": "^5.6.1", "@prisma/client": "^6.5.0", "prisma": "^6.5.0", - "electron": "^35.0.2", "@types/sharp": "^0.31.1", "antd": "^5.24.4", "electron-is-dev": "^3.0.1",