diff --git a/.changelog-config.yaml b/.changelog-config.yaml index d369faa..a562adb 100644 --- a/.changelog-config.yaml +++ b/.changelog-config.yaml @@ -104,7 +104,7 @@ valid_author_tokens: # Rules applied to commits to determine the type of release to suggest. release_hint_rules: - - match_result: release-candidate + - match_result: dev branch: ^((?!master|main).)*$ - match_result: patch path: requirements/prod.in diff --git a/.github/workflows/bumpversion.yaml b/.github/workflows/bumpversion.yaml index 7759869..07ec6c4 100644 --- a/.github/workflows/bumpversion.yaml +++ b/.github/workflows/bumpversion.yaml @@ -73,6 +73,9 @@ jobs: BUMPVERSION_NEW_VERSION: ${{ inputs.tags }} BUMPVERSION_VERBOSE: ${{ inputs.verbose }} run: | + PR_NUMBER=$(gh pr view --json number -q .number || echo "") + REVISION=$(git describe --tags --long | awk -F- '{print $2}') + export PR_NUMBER REVISION case "$RELEASE_KIND" in major|minor|patch) bump-my-version bump "$RELEASE_KIND" @@ -81,10 +84,8 @@ jobs: git push --tags fi ;; - release-candidate) - PR_NUMBER=$(gh pr view --json number -q .number || echo "") - REVISION=$(git describe --tags --long | awk -F- '{print $2}') - bump-my-version bump -v --no-tag --no-commit "release_candidate" + dev) + bump-my-version bump -v --no-tag --no-commit "dev" python -m build ;; esac