Skip to content
Snippets Groups Projects
Commit 5579dbac authored by Dylan Aïssi's avatar Dylan Aïssi
Browse files

branching: create a merge request from branch-update-infrastructure instead of...

branching: create a merge request from branch-update-infrastructure instead of direcly pushing to main

This job push a commit to the repo where the branching pipeline is
currently running. Consequently, the actual branching pipeline
is cancel by a new dummy one based on the new commit. To avoid
cancelling the current pipeline, instead we create a merge request
that can be merged once the branching pipeline is completed to
avoid cancellation.

Signed-off-by: default avatarDylan Aïssi <dylan.aissi@collabora.com>
parent ccff4400
No related branches found
No related tags found
1 merge request!226branching: create a merge request from branch-update-infrastructure instead of direcly pushing to main
Pipeline #815943 passed with warnings
......@@ -85,10 +85,12 @@ update-repo-default(){
update-repo-infrastructure-infrastructure(){
if [ -f gitlab-rulez/rulez.yaml ] && ! grep -q -w ${NEXT_RELEASE} gitlab-rulez/rulez.yaml
then
git branch bump/${NEXT_RELEASE} origin/main
git checkout bump/${NEXT_RELEASE}
sed -i "s/\&current_release_branch .*/\&current_release_branch ${OSNAME}\/${NEXT_RELEASE}/" gitlab-rulez/rulez.yaml
git commit -s -m "Bump to ${NEXT_RELEASE}" gitlab-rulez/rulez.yaml
fi
$RUN git push origin
$RUN git push origin bump/${NEXT_RELEASE} -o merge_request.create -o merge_request.target=main
}
update-repo-ci-flatdeb-builder(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment