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

Put check in place to not MR lib branch in sync with master.

Browse Source 
Get branch of libs submodules from .gitmodules
This commit is contained in:
andrewc
2023-10-24 16:52:42 +10:00
parent 107f2d7443
commit dfac3a068c
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kibot-ci.yml
View File

@@ -129,19 +129,17 @@ image:
git submodule update --init --remote --merge $d git submodule update --init --remote --merge $d
done done
git submodule status git submodule status
git submodule foreach git log -1
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR
for d in "libs/melonlib" "libs/melon3d" for d in "libs/melonlib" "libs/melon3d"
do do
cd $d cd $d
CURR_B=$(git branch --remote --verbose --no-abbrev --contains | sed -rne 's/^[^\/]*\/([^\ ]+).*$/\1/p') if [ $(git rev-parse HEAD) != $(git rev-parse master) ]
git rev-parse HEAD then
git branch -a CURR_B=$(git config -f $CI_PROJECT_DIR.gitmodules submodule.$d.branch)
git remote get-url origin git checkout $CURR_B
echo $CURR_B git commit --allow-empty -m "Merge"
git checkout origin/$CURR_B 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 commit --allow-empty -m "Merge" fi
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
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR
done done
fi fi