diff --git a/.bumpversion.toml b/.bumpversion.toml index 401d3a7..5455d4a 100644 --- a/.bumpversion.toml +++ b/.bumpversion.toml @@ -9,16 +9,16 @@ 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}" +# 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 = [] +# moveable_tags = [] +# commit_args = "" +# setup_hooks = [] +# pre_commit_hooks = [] +# post_commit_hooks = [] [[tool.bumpversion.files]] filename = "pyproject.toml" diff --git a/.github/workflows/bump-version-by-labels.yml b/.github/workflows/bump-version-by-labels.yml index c766f6a..70f6018 100644 --- a/.github/workflows/bump-version-by-labels.yml +++ b/.github/workflows/bump-version-by-labels.yml @@ -14,6 +14,10 @@ jobs: pull-requests: write steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: Bump Version id: bump-version uses: conjikidow/bump-version@v2.0.0 @@ -23,6 +27,12 @@ jobs: label-patch: 'Patch' create-release: 'false' + - name: Auto-merge pull request + if: steps.bump-version.outputs.version-bumped == 'true' + run: gh pr merge --squash --auto "${{ github.event.pull_request.number }}" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Debug outputs run: | echo "version-bumped=${{ steps.bump-version.outputs.version-bumped }}"