diff --git a/scripts/common.py b/scripts/common.py index 3f4d2bbed77eda115c338303626ba494f4dbf649..26f6af0a327d6ba3412b422749a2be0b6d0784be 100755 --- a/scripts/common.py +++ b/scripts/common.py @@ -158,9 +158,10 @@ def list_commits(commits): def commit_and_push( - project: Project, repo: Repo, branch, message, name, email, less_verbose=False + project: Project, repo: Repo, message, name, email, less_verbose=False ): """Commit and push to a repo branch""" + branch = repo.head.reference author = Actor(name, email) repo.index.commit(message, author=author, committer=author) print(repo.git.log("--oneline", "-n", "5")) diff --git a/scripts/deploy_gitlab_ci.py b/scripts/deploy_gitlab_ci.py index 88839d303732b3f1f9fd24731860eccb6b6689e0..a24b45aed894c254b13001ef5c66ee45eadf6cb9 100755 --- a/scripts/deploy_gitlab_ci.py +++ b/scripts/deploy_gitlab_ci.py @@ -347,7 +347,6 @@ def main(): integration_commit = common.commit_and_push( manifest_project["project"], manifest_project["repo"], - manifest_project["branch"], manifest_project["message"], gitlab.user.username, gitlab.user.email, diff --git a/scripts/integrate_into_manifest.py b/scripts/integrate_into_manifest.py index 8c0fd7d213a25dce9aa8222d178674965004eba0..f943991b261ea9c01cef19b5c47391a685081d92 100755 --- a/scripts/integrate_into_manifest.py +++ b/scripts/integrate_into_manifest.py @@ -178,7 +178,6 @@ def integrate_into_manifest( manifest_revision = common.commit_and_push( manifest_project, manifest_repo, - integration_branch, message, gitlab.user.username, gitlab.user.email, diff --git a/scripts/update_submodule.py b/scripts/update_submodule.py index 32bfe97d8aff59782cc6be72c5493935f5b3d1bc..d5f6b123ef01ce9dd50bc29bffbfd2f3d1b5c05b 100755 --- a/scripts/update_submodule.py +++ b/scripts/update_submodule.py @@ -383,7 +383,6 @@ def update_submodule_and_include_ref( integration_commit = common.commit_and_push( project, project_repo, - integration_branch_name, message, gitlab.user.username, gitlab.user.email,