fix(dependencies): only open PR if there are relevant changes (#13454)

Fixes cases like #13453
master
Carlo Sala 7 months ago committed by GitHub
parent a449c0247d
commit ca5c467db1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 62
      .github/workflows/dependencies/updater.py

@ -219,31 +219,32 @@ class Dependency:
# Create new branch # Create new branch
branch = Git.checkout_or_create_branch(branch_name) branch = Git.checkout_or_create_branch(branch_name)
# Update dependencies.yml file
self.__update_yaml(
f"tag:{new_version}" if is_tag else status["version"]
)
# Update dependency files # Update dependency files
self.__apply_upstream_changes() self.__apply_upstream_changes()
# Add all changes and commit if not Git.repo_is_clean():
has_new_commit = Git.add_and_commit(self.name, new_version) # Update dependencies.yml file
self.__update_yaml(
f"tag:{new_version}" if is_tag else status["version"]
)
# Add all changes and commit
has_new_commit = Git.add_and_commit(self.name, new_version)
if has_new_commit: if has_new_commit:
# Push changes to remote # Push changes to remote
Git.push(branch) Git.push(branch)
# Create GitHub PR # Create GitHub PR
GitHub.create_pr( GitHub.create_pr(
branch, branch,
f"feat({self.name}): update to version {new_version}", f"feat({self.name}): update to version {new_version}",
f"""## Description f"""## Description
Update for **{self.desc}**: update to version [{new_version}]({status['head_url']}). Update for **{self.desc}**: update to version [{new_version}]({status["head_url"]}).
Check out the [list of changes]({status['compare_url']}). Check out the [list of changes]({status["compare_url"]}).
""", """,
) )
# Clean up repository # Clean up repository
Git.clean_repo() Git.clean_repo()
@ -275,8 +276,8 @@ Check out the [list of changes]({status['compare_url']}).
There is a new version of `{self.name}` {self.kind} available. There is a new version of `{self.name}` {self.kind} available.
New version: [{new_version}]({status['head_url']}) New version: [{new_version}]({status["head_url"]})
Check out the [list of changes]({status['compare_url']}). Check out the [list of changes]({status["compare_url"]}).
""" """
print("Creating GitHub issue", file=sys.stderr) print("Creating GitHub issue", file=sys.stderr)
@ -378,20 +379,27 @@ class Git:
return branch_name return branch_name
@staticmethod @staticmethod
def add_and_commit(scope: str, version: str) -> bool: def repo_is_clean() -> bool:
""" """
Returns `True` if there were changes and were indeed commited. Returns `True` if the repo is clean.
Returns `False` if the repo was clean and no changes were commited. Returns `False` if the repo is dirty.
""" """
# check if repo is clean (clean => no error, no commit)
try: try:
CommandRunner.run_or_fail( CommandRunner.run_or_fail(
["git", "diff", "--exit-code"], stage="CheckRepoClean" ["git", "diff", "--exit-code"], stage="CheckRepoClean"
) )
return False return True
except CommandRunner.Exception: except CommandRunner.Exception:
# if it's other kind of error just throw! return False
pass
@staticmethod
def add_and_commit(scope: str, version: str) -> bool:
"""
Returns `True` if there were changes and were indeed commited.
Returns `False` if the repo was clean and no changes were commited.
"""
if Git.repo_is_clean():
return False
user_name = os.environ.get("GIT_APP_NAME") user_name = os.environ.get("GIT_APP_NAME")
user_email = os.environ.get("GIT_APP_EMAIL") user_email = os.environ.get("GIT_APP_EMAIL")

Loading…
Cancel
Save