From 9ea5739bad897f99f03ee46be10dd45341f42c4f Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Thu, 29 May 2025 11:12:08 +0200 Subject: [PATCH 1/4] move bumpmyversion to pyproject --- .bumpversion.toml | 21 --------------------- pyproject.toml | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 21 deletions(-) delete mode 100644 .bumpversion.toml diff --git a/.bumpversion.toml b/.bumpversion.toml deleted file mode 100644 index 894b569..0000000 --- a/.bumpversion.toml +++ /dev/null @@ -1,21 +0,0 @@ -[tool.bumpversion] -current_version = "0.1.0" -parse = "(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)" -serialize = ["{major}.{minor}.{patch}"] -search = "{current_version}" -replace = "{new_version}" -regex = false -ignore_missing_version = false -ignore_missing_files = false -tag = false -sign_tags = false -tag_name = "v{new_version}" -tag_message = "Bump version: {current_version} → {new_version}" -allow_dirty = false -commit = false -message = "Bump version: {current_version} → {new_version}" -moveable_tags = [] -commit_args = "" -setup_hooks = [] -pre_commit_hooks = [] -post_commit_hooks = [] diff --git a/pyproject.toml b/pyproject.toml index c915fc2..55e0e73 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -19,3 +19,25 @@ build-backend = "hatchling.build" [tool.uv.sources] komconfig = { workspace = true } + +[tool.bumpversion] +current_version = "0.1.0" +parse = "(?P\\d+)\\.(?P\\d+)\\.(?P\\d+)" +serialize = ["{major}.{minor}.{patch}"] +search = "{current_version}" +replace = "{new_version}" +regex = false +ignore_missing_version = false +ignore_missing_files = false +tag = false +sign_tags = false +tag_name = "v{new_version}" +tag_message = "Bump version: {current_version} → {new_version}" +allow_dirty = false +commit = false +message = "Bump version: {current_version} → {new_version}" +moveable_tags = [] +commit_args = "" +setup_hooks = [] +pre_commit_hooks = [] +post_commit_hooks = [] From 63a14a159c3f8b4fbd49bb1dbaa2ea5b1d40fbc8 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Thu, 29 May 2025 11:14:42 +0200 Subject: [PATCH 2/4] Enable version tagging and allow commits in bumpversion configuration --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 55e0e73..cf76b1d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -29,12 +29,12 @@ replace = "{new_version}" regex = false ignore_missing_version = false ignore_missing_files = false -tag = false +tag = true sign_tags = false tag_name = "v{new_version}" tag_message = "Bump version: {current_version} → {new_version}" -allow_dirty = false -commit = false +allow_dirty = true +commit = true message = "Bump version: {current_version} → {new_version}" moveable_tags = [] commit_args = "" From 39e9ce2f8fc84e482e4defa26f817aeb5bba6999 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Thu, 29 May 2025 11:19:40 +0200 Subject: [PATCH 3/4] add changelog template --- .gitea/changelog-config.json | 46 ++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 .gitea/changelog-config.json diff --git a/.gitea/changelog-config.json b/.gitea/changelog-config.json new file mode 100644 index 0000000..acbf2d3 --- /dev/null +++ b/.gitea/changelog-config.json @@ -0,0 +1,46 @@ +{ + "categories": [ + { + "title": "## 🚀 Features", + "labels": ["add","Add", "Kind/Feature"] + }, + { + "title": "## 🐛 Fixes", + "labels": ["fix","Fix", "Kind/Bug"] + }, + { + "title": "## 🧪 Upgrade", + "labels": ["upgrade","Upgrade","Clean"] + } + , + { + "title": "## 📝 Documentation", + "labels": ["docs","Docs", "Kind/Documentation"] + }, + { + "title": "## 🧹 Chore", + "labels": ["chore","Chore", "Kind/Chore"] + }, + { + "title": "## 🛠️ Maintenance", + "labels": ["maintenance","Maintenance", "Kind/Maintenance"] + }, + { + "title": "## 🗑️ Deprecation", + "labels": ["deprecation","Deprecation", "Kind/Deprecation"] + } + ], + "label_extractor": [ + { + "pattern": "(\\w+) (.+)", + "target": "$1", + "on_property": "title" + } + ], + "sort": "ASC", + "template": "${{CHANGELOG}}", + "pr_template": "- ${{TITLE}}\n - PR: #${{NUMBER}}", + "empty_template": "- no changes", + "max_pull_requests": 1000, + "max_back_track_time_days": 1000 +} \ No newline at end of file From ac6750ab6958c0979461442b059de3c064bb2d53 Mon Sep 17 00:00:00 2001 From: WorldTeacher Date: Thu, 29 May 2025 11:21:15 +0200 Subject: [PATCH 4/4] Remove release notes input and streamline changelog generation in build workflow --- .gitea/workflows/build.yml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index a77bb37..2e1af5c 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -1,10 +1,6 @@ on: workflow_dispatch: inputs: - release_notes: - description: Release notes (use \n for newlines) - type: string - required: false github_release: description: 'Create Gitea Release' default: true @@ -48,13 +44,15 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} branch: ${{ github.ref }} - - name: Create release notes - run: | - mkdir release_notes - echo -e "${{ inputs.release_notes }}" >> release_notes/release_notes.md - echo "Release notes:" - cat release_notes/release_notes.md - echo "" + - name: Build Changelog + id: build_changelog + uses: https://github.com/mikepenz/release-changelog-builder-action@v5 + with: + platform: "gitea" + baseURL: "http://gitea:3000" + configuration: ".gitea/changelog-config.json" + env: + GITHUB_TOKEN: ${{ secrets.GITEA_TOKEN }} - name: Build package run: uv build - name: Publish package @@ -70,7 +68,7 @@ jobs: with: tag_name: ${{ env.VERSION }} release_name: Release ${{ env.VERSION }} - body_path: release_notes/release_notes.md + body: ${{steps.build_changelog.outputs.changelog}} draft: false prerelease: false make_latest: true