diff --git a/.gitlab/update.yml b/.gitlab/update.yml index 7902c33..2860ef4 100644 --- a/.gitlab/update.yml +++ b/.gitlab/update.yml @@ -40,16 +40,18 @@ create_pr: script: - test -z ${DO_UPDATE} && { echo "No updates required. Not creating PR"; exit 0; } - >- - CREATE_MR=$(gitlab project-merge-request create + CREATE_MR="$(gitlab project-merge-request create --remote-source-branch true --project-id ${CI_PROJECT_ID} --source-branch "${BRANCH}" --target-branch "main" - --title "Update ISO checksums" + --title "Update ISO checksums")" - IID=${CREATE_MR#* } - - >- - 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" + # Auto-merge through the REST API throws an error, and I can't get it to work through the + # GraphQL API either. There it doesn't return an error, but the auto-merge does not happen + #- >- + #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"