greg/vms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update the update script

Browse Source
This commit is contained in:
Greg Hellings
2025-10-06 15:29:38 -05:00
parent ccf3818c8e
commit 0a32fe9f9a
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab/update.yml
+10 -8
View File
@@ -40,16 +40,18 @@ create_pr:
script: script:
- test -z ${DO_UPDATE} && { echo "No updates required. Not creating PR"; exit 0; } - 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 --remote-source-branch true
--project-id ${CI_PROJECT_ID} --project-id ${CI_PROJECT_ID}
--source-branch "${BRANCH}" --source-branch "${BRANCH}"
--target-branch "main" --target-branch "main"
--title "Update ISO checksums" --title "Update ISO checksums")"
- IID=${CREATE_MR#* } - IID=${CREATE_MR#* }
- >- # Auto-merge through the REST API throws an error, and I can't get it to work through the
gitlab project-merge-request merge # GraphQL API either. There it doesn't return an error, but the auto-merge does not happen
--project-id ${CI_PROJECT_ID} #- >-
--iid ${IID} #gitlab project-merge-request merge
--merge-when-pipeline-succeeds true #--project-id ${CI_PROJECT_ID}
- echo "PR set to auto-merge if build succeeds" #--iid ${IID}
#--merge-when-pipeline-succeeds true
#- echo "PR set to auto-merge if build succeeds"