fix gitlab pipeline commit bug

Author: aguard-redgate

Gitlab-Templatized/.gitlab/ci/generate-deployment-scripts.yml

@@ -150,12 +150,17 @@
     - "git diff --cached --stat"
     - "git commit -m \"${GIT_COMMIT_MESSAGE}\""
     - "if [ -n \"${GIT_PUSH_TOKEN}\" ]; then CURRENT_URL=$(git remote get-url origin); PUSH_URL=$(echo \"${CURRENT_URL}\" | sed \"s|://[^@]*@|://oauth2:${GIT_PUSH_TOKEN}@|\"); git remote set-url origin \"${PUSH_URL}\"; fi"
+    - "git fetch origin ${CI_COMMIT_REF_NAME}"
+    - "git rebase origin/${CI_COMMIT_REF_NAME}"
     - "git push origin HEAD:${CI_COMMIT_REF_NAME}"
     - "echo '--- Creating merge request ---'"
     - "API_TOKEN=${GIT_PUSH_TOKEN:-${CI_JOB_TOKEN}}"
-    - "GITLAB_API_URL=$(git remote get-url origin | sed 's|/[^/]*/[^/]*\\.git$||')/api/v4"
-    - "EXISTING_MR=$(curl -sf --header \"PRIVATE-TOKEN: ${API_TOKEN}\" \"${GITLAB_API_URL}/projects/${CI_PROJECT_ID}/merge_requests?source_branch=${CI_COMMIT_REF_NAME}&target_branch=${MR_TARGET_BRANCH}&state=opened\" | jq '.[0].iid // empty')"
-    - "if [ -n \"${EXISTING_MR}\" ]; then echo \"Merge request already exists (MR !${EXISTING_MR})\"; MR_IID=${EXISTING_MR}; else MR_RESPONSE=$(curl -sf --header \"PRIVATE-TOKEN: ${API_TOKEN}\" --header \"Content-Type: application/json\" --data \"{\\\"source_branch\\\": \\\"${CI_COMMIT_REF_NAME}\\\", \\\"target_branch\\\": \\\"${MR_TARGET_BRANCH}\\\", \\\"title\\\": \\\"${MR_TITLE}\\\", \\\"remove_source_branch\\\": false}\" \"${GITLAB_API_URL}/projects/${CI_PROJECT_ID}/merge_requests\"); MR_IID=$(echo \"${MR_RESPONSE}\" | jq -r .iid); fi"
+    - "GITLAB_API_URL=$(git remote get-url origin | sed 's|://[^@]*@|://|; s|\\.git$||; s|/[^/]*/[^/]*$||')/api/v4"
+    - "echo \"API URL: ${GITLAB_API_URL}\""
+    - "MR_RESPONSE=$(curl -s --header \"PRIVATE-TOKEN: ${API_TOKEN}\" \"${GITLAB_API_URL}/projects/${CI_PROJECT_ID}/merge_requests?source_branch=${CI_COMMIT_REF_NAME}&target_branch=${MR_TARGET_BRANCH}&state=opened\")"
+    - "echo \"MR lookup response: ${MR_RESPONSE}\""
+    - "EXISTING_MR=$(echo \"${MR_RESPONSE}\" | jq -r 'if type == \"array\" then (.[0].iid // empty) else empty end')"
+    - "if [ -n \"${EXISTING_MR}\" ]; then echo \"Merge request already exists (MR !${EXISTING_MR})\"; MR_IID=${EXISTING_MR}; else MR_RESPONSE=$(curl -s --header \"PRIVATE-TOKEN: ${API_TOKEN}\" --header \"Content-Type: application/json\" --data \"{\\\"source_branch\\\": \\\"${CI_COMMIT_REF_NAME}\\\", \\\"target_branch\\\": \\\"${MR_TARGET_BRANCH}\\\", \\\"title\\\": \\\"${MR_TITLE}\\\", \\\"remove_source_branch\\\": false}\" \"${GITLAB_API_URL}/projects/${CI_PROJECT_ID}/merge_requests\"); echo \"MR create response: ${MR_RESPONSE}\"; MR_IID=$(echo \"${MR_RESPONSE}\" | jq -r .iid); fi"
     - "BROWSE_URL=${GITLAB_EXTERNAL_URL:-${CI_SERVER_URL}}/${CI_PROJECT_PATH}/-/merge_requests/${MR_IID}"
     - "echo '========================================'"
     - "echo \"Review and merge: ${BROWSE_URL}\""