Merge branch 'develop' into 'main'

Merging develop into main

See merge request !54

Dockerfile

@@ -21,7 +21,7 @@ ARG DOCKER_CHANNEL=stable
 ARG DOCKER_VERSION=24.0.2
 ARG GIT_EXTRAS_VERSION=7.0.0
 ARG AHOY_VERSION=2.1.1
-ARG GLAB_VERSION=1.30.0
+ARG GLAB_VERSION=1.31.0
 
 ADD usrbin/column /usr/bin/column
 ADD bin/* /usr/local/bin/

bin/merge

@@ -6,6 +6,15 @@ if [[ "x$TARGETBRANCH" == "x" ]]; then
     echo "Main branch can not be merged."
     exit 1
   elif [[ "$SOURCEBRANCH" == "develop" ]]; then
+    # Check if remote branch "release" exists.
+    EC=0
+    git rev-parse --quiet --verify origin/release >/dev/null || EC=$?
+    if [[ $EC -eq 0 ]]; then
+      TARGETBRANCH=release
+    else
+      TARGETBRANCH=main
+    fi
+  elif [[ "$SOURCEBRANCH" == "release" ]]; then
     TARGETBRANCH=main
   else
     TARGETBRANCH=develop
@@ -29,10 +38,13 @@ fi
 
 git fetch
 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
+glab mr create --fill --yes --source-branch ${SOURCEBRANCH} --target-branch ${TARGETBRANCH} --title "$TITLE" > /tmp/glab.log 2>&1
+EC=0
+grep "could not find any commits" /tmp/glab.log || EC=$?
+if [[ $EC -eq 0 ]]; then echo "No changes available."; exit 0; fi
 EC=0
 grep "Failed to create merge request." /tmp/glab.log || EC=$?
-if [[ $EC -eq 0 ]]; then glab mr create --recover > /tmp/glab.log; fi
+if [[ $EC -eq 0 ]]; then glab mr create --recover > /tmp/glab.log 2>&1; fi
 EC=0
 grep "Failed to create merge request." /tmp/glab.log || EC=$?
 if [[ $EC -eq 0 ]]; then exit 1; fi