diff --git a/.gitlab/ci/update.yml b/.gitlab/ci/update.yml index f507bc3..a2c65ca 100644 --- a/.gitlab/ci/update.yml +++ b/.gitlab/ci/update.yml @@ -43,13 +43,13 @@ create_pr: CREATE_MR=$(gitlab project-merge-request create --remove-source-branch true --project-id ${CI_PROJECT_ID} - --source-branch "${BRANCfh}" + --source-branch "${BRANCH}" --target-branch "main" --title "Update sword to r$NEW_REV") - IID=${CREATE_MR#* } - >- - gitlab project-merge-request merge \ - --project-id ${CI_PROJECT_ID} \ - --iid ${IID} \ + gitlab project-merge-request merge + --project-id ${CI_PROJECT_ID} + --iid ${IID} --merge-when-pipeline-succeeds true - echo "PR set to auto-merge if build succeeds"