diff --git a/kibot-ci.yml b/kibot-ci.yml index 567e1dd..beb3952 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -135,9 +135,13 @@ image: cd $d if [ $(git rev-parse HEAD) != $(git rev-parse master) ] then - CURR_B=$(git config -f $CI_PROJECT_DIR.gitmodules submodule.$d.branch) + CURR_B=$(git config -f $CI_PROJECT_DIR/.gitmodules submodule.$d.branch) + echo CURR_B + echo $CURR_B git checkout $CURR_B + echo "about to commit" git commit --allow-empty -m "Merge" + echo "about to push" git push HEAD:$CURR_B -o merge_request.create -o merge_request.remove_source_branch=false -o merge_request.merge_when_pipeline_succeeds -o merge_request.target=master fi cd $CI_PROJECT_DIR