Skip to content
Snippets Groups Projects
Commit 0abbdbd2 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !44
parents 729be16b e5d7d1a1
No related branches found
Tags v2.1.6
1 merge request!44Merging develop into main
Pipeline #788138 passed
......@@ -28,10 +28,13 @@ if [[ "$1" == "major" ]]; then
fi
sleep 2
rm /tmp/glab.log || true
rm /tmp/glab.log >/dev/null 2>&1 || 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 -eq 0 ]]; then glab mr create --recover; fi
if [[ $EC -eq 0 ]]; then glab mr create --recover > /tmp/glab.log; fi
EC=0
grep "Failed to create merge request." /tmp/glab.log || EC=$?
if [[ $EC -eq 0 ]]; then exit 1; fi
sleep 5
glab mr merge --yes ${SOURCEBRANCH}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment