public/kicad-ci
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Missed a slash in finding submodule branch command

Browse Source
This commit is contained in:
andrewc
2023-10-24 17:00:48 +10:00
parent dfac3a068c
commit e2955f6602
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kibot-ci.yml
View File

@@ -135,9 +135,13 @@ image:
cd $d cd $d
if [ $(git rev-parse HEAD) != $(git rev-parse master) ] if [ $(git rev-parse HEAD) != $(git rev-parse master) ]
then 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 git checkout $CURR_B
echo "about to commit"
git commit --allow-empty -m "Merge" 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 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 fi
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR