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

Switched to main instead of master for libs push

Browse Source
This commit is contained in:
andrewc
2023-10-24 17:35:26 +10:00
parent 6c01737809
commit 1df56d6acd
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kibot-ci.yml
View File

@@ -135,7 +135,7 @@ image:
for d in "libs/melonlib" "libs/melon3d" for d in "libs/melonlib" "libs/melon3d"
do do
cd $d cd $d
if [ $(git rev-parse HEAD) != $(git rev-parse master) ] if [ $(git rev-parse HEAD) != $(git rev-parse main) ]
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
@@ -145,7 +145,7 @@ image:
git commit --allow-empty -m "Merge" git commit --allow-empty -m "Merge"
echo "about to push" echo "about to push"
git remote get-url origin git remote get-url origin
git push -u origin 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 -u origin 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=main
fi fi
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR
done done