From 1aa51f580fdb33acf07dd460334f1cdd1b98fc4f Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@garz-fricke.com>
Date: Tue, 1 Mar 2022 09:57:01 +0100
Subject: [PATCH] deploy_gitlab_ci: exit successfully if submodule already up
to date
---
deploy_gitlab_ci.py | 3 +++
update_submodule.py | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/deploy_gitlab_ci.py b/deploy_gitlab_ci.py
index ec5bb677..dd3de862 100755
--- a/deploy_gitlab_ci.py
+++ b/deploy_gitlab_ci.py
@@ -67,6 +67,9 @@ def main():
integration_branch, _, submodule_project = update_submodule(
project, args.submodule, args.revision, args.branch
)
+ # If submodule is already at specified revision, exit successfully
+ if not integration_branch:
+ sys.exit(0)
# Get source merge request
mrs = get_merge_requests(
diff --git a/update_submodule.py b/update_submodule.py
index e0462e2d..12929e20 100755
--- a/update_submodule.py
+++ b/update_submodule.py
@@ -40,7 +40,7 @@ def update_submodule(project, submodule_name, submodule_revision, branch=None):
# Check if revisions are different
if submodule.hexsha == submodule_revision:
print("Submodule is already at %s" % submodule_revision)
- return 0
+ return (None, None, None)
# Check for relative path
if not submodule.url.startswith(".."):
--
GitLab