From 6edf4001a1434e78172c52a260f102bece279739 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Mon, 27 Feb 2023 10:41:56 +0100
Subject: [PATCH] Improving merge script
---
bin/merge | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/bin/merge b/bin/merge
index 4f626a6..4e7067e 100755
--- a/bin/merge
+++ b/bin/merge
@@ -1,7 +1,5 @@
#!/bin/bash
-set -e
-
SOURCEBRANCH=$(git rev-parse --abbrev-ref HEAD)
if [[ "x$TARGETBRANCH" == "x" ]]; then
if [[ "$SOURCEBRANCH" == "main" ]]; then
@@ -29,6 +27,11 @@ if [[ "$1" == "major" ]]; then
TITLE="${TITLE} [MAJOR_VERSION]"
fi
-glab mr create --fill --yes --source-branch ${SOURCEBRANCH} --target-branch ${TARGETBRANCH} --title "$TITLE"
+sleep 5
+rm /tmp/glab.log || true
+glab mr create --fill --yes --source-branch ${SOURCEBRANCH} --target-branch ${TARGETBRANCH} --title "$TITLE" > /tmp/glab.log
+EC=0
+grep "Failed to create merge request." /tmp/glab.log || EC=$?
+if [[ $EC -neq 0 ]]; then glab mr create --recover; fi
sleep 5
glab mr merge --yes ${SOURCEBRANCH}
--
GitLab