Skip to content

Commit

Permalink
Fixes workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
coordt committed Oct 22, 2023
1 parent 11a455e commit 5ebb0d7
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 11 deletions.
20 changes: 13 additions & 7 deletions .github/workflows/bumpversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ jobs:

- name: Install requirements
run: |
python -m pip install generate-changelog
python -m pip install -e .
python -m pip install generate-changelog bump-my-version
- name: Git check
run: |
Expand Down Expand Up @@ -74,8 +73,15 @@ jobs:
BUMPVERSION_NEW_VERSION: ${{ inputs.tags }}
BUMPVERSION_VERBOSE: ${{ inputs.verbose }}
run: |
bump-my-version -v "$RELEASE_KIND"
if [[ BUMPVERSION_DRY_RUN == "false" ]]; then
git push
git push --tags
fi
case "$RELEASE_KIND" in
major|minor|patch)
bump-my-version bump "$RELEASE_KIND"
if [[ BUMPVERSION_DRY_RUN == "false" ]]; then
git push
git push --tags
fi
;;
release-candidate)
bump-my-version bump --no-commit "$RELEASE_KIND"
;;
esac
3 changes: 1 addition & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,11 @@ jobs:
- name: Set dev version
shell: bash
run: |
bumpversion dev bumpversion/__init__.py --no-commit --no-configured-files -v
bump-my-version bump dev bumpversion/__init__.py --no-commit --no-configured-files -v
- name: Package
shell: bash
run: |
python -m pip install --disable-pip-version-check --no-python-version-warning build
python -m build
- name: Upload package to Test PyPI
Expand Down
2 changes: 0 additions & 2 deletions bumpversion/scm.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,6 @@ def latest_tag_info(cls, tag_pattern: str) -> SCMInfo:

try:
# get info about the latest tag in git
# TODO: This only works if the tag name is prefixed with `v`.
# Should allow for the configured format for the tag name.
git_cmd = [
"git",
"describe",
Expand Down

0 comments on commit 5ebb0d7

Please sign in to comment.