Merge branch 'develop' into 'main'

Merging develop into main

See merge request !9

bin/merge

@@ -52,7 +52,9 @@ else
 fi
 if [[ -n ${CI_SERVER_URL} ]]; then
   GITLAB_URL=$CI_SERVER_URL
-  GITLAB_PRIVATE_TOKEN=$CI_JOB_TOKEN
+fi
+if [[ -n ${GITLAB_ACCESS_TOKEN} ]]; then
+  GITLAB_PRIVATE_TOKEN=$GITLAB_ACCESS_TOKEN
 fi
 if [[ "x${GITLAB_URL}" == "x" ]]; then
   echo "Missing GITLAB_URL environment variable, should be set to e.g. https://gitlab.lakedrops.com"
@@ -97,5 +99,6 @@ echo "Created MR at $(echo "$result"  | jq -r ."web_url")"
 
 echo "Merge ..."
 # Merge MR
+sleep 5
 gitlab 200 PUT projects/"$PRJID"/merge_requests/"$MRID"/merge --data "should_remove_source_branch=0"
 echo "Merged successfully!"