Update the update script

This commit is contained in:
Greg Hellings
2025-10-06 15:29:38 -05:00
parent ccf3818c8e
commit 0a32fe9f9a
+10 -8
View File
@@ -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"