diff --git a/.bumpversion.cfg b/.bumpversion.cfg index ac647bb..2be3cc8 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 1.0.13 +current_version = 1.0.17 commit = True tag = False diff --git a/.github/workflows/version-controller.yml b/.github/workflows/version-controller.yml index 5724989..5df11a3 100644 --- a/.github/workflows/version-controller.yml +++ b/.github/workflows/version-controller.yml @@ -105,7 +105,7 @@ jobs: const head = '${{ steps.determine_branch.outputs.current_branch }}'; const base = '${{ steps.determine_branch.outputs.next_branch }}'; const version = '${{ steps.create_tag.outputs.tag_name }}'; - const title = `From ${head} → Bump version: ${version} into ${base}`; + const title = `🔖 From ${head} → Bump version: ${version} into ${base}`; const body = `Automatically created pull request for release ${version} into ${base} branch.`; const { data: existingPRs } = await github.rest.pulls.list({ diff --git a/commit_msg_version_bump/main.py b/commit_msg_version_bump/main.py index e8f2919..0a7f37d 100644 --- a/commit_msg_version_bump/main.py +++ b/commit_msg_version_bump/main.py @@ -238,7 +238,7 @@ def amend_commit(new_commit_msg: str) -> None: subprocess.run(["git", "commit", "--amend", "-m", new_commit_msg], check=True) logger.info("Successfully amended the commit with the new version bump.") logger.info( - "Please perform a force push using 'git push --force' to update the remote repository." + "Please perform a force push using 'git push' to update the remote repository. Avoid use --force" ) except subprocess.CalledProcessError as e: logger.error(f"Failed to amend the commit: {e}") @@ -283,7 +283,7 @@ def main() -> None: amend_commit(updated_commit_msg) logger.info( - "Aborting the current push. Please perform a force push using 'git push --force'." + "Aborting the current push. Please perform a force push using 'git push'. Avoid use --force" ) sys.exit(1) else: diff --git a/pyproject.toml b/pyproject.toml index 16e97b5..d828076 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "scripts" -version = "1.0.13" +version = "1.0.17" description = "CICD Core Scripts" authors = ["B "] license = "Apache 2.0" @@ -71,5 +71,5 @@ ensure_newline_before_comments = true rcfile = ".pylintrc" [build-system] -requires = ["poetry-core>=1.0.13"] +requires = ["poetry-core>=1.0.17"] build-backend = "poetry.core.masonry.api"