Merge pull request #115 from callowayproject/decouple-commit-and-tag

Decouple commit and tag
callowayproject · Dec 29, 2023 · 97b94dc · 97b94dc
2 parents 9418a14 + 10e8ed0
commit 97b94dc
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -83,7 +83,7 @@ jobs:
           export PR_NUMBER=$(gh pr view --json number -q .number || echo "")
           echo "PR_NUMBER=$PR_NUMBER" >> $GITHUB_ENV
           echo "::notice::PR_NUMBER is: ${PR_NUMBER}"
-          bump-my-version bump dev bumpversion/__init__.py --no-commit --no-configured-files -v
+          bump-my-version bump dev bumpversion/__init__.py --no-commit --no-tag --no-configured-files -v
         env:
           GH_TOKEN: ${{ secrets.PAT }}
 

diff --git a/bumpversion/scm.py b/bumpversion/scm.py
@@ -177,9 +177,6 @@ def commit_to_scm(
     @classmethod
     def tag_in_scm(cls, config: "Config", context: MutableMapping, dry_run: bool = False) -> None:
         """Tag the current commit in the source code management system."""
-        if not config.commit:
-            logger.info("Would not tag since we are not committing")
-            return
         if not config.tag:
             logger.info("Would not tag")
             return

diff --git a/tests/test_scm.py b/tests/test_scm.py
@@ -160,7 +160,7 @@ def test_commit_and_tag_from_below_scm_root(repo: str, scm_command: str, scm_cla
     [
         param(True, True, True, False, False, id="dry-run-stops-commit-and-tag"),
         param(True, False, False, True, False, id="commit-no-tag"),
-        param(False, True, False, False, False, id="no-commit-stops-tag"),
+        param(False, True, False, False, True, id="no-commit-will-tag"),
     ],
 )
 def test_commit_tag_dry_run_interactions(