From 1df56d6acd3278b27a3ab670603e33d8e61c3c51 Mon Sep 17 00:00:00 2001
From: andrewc <andrew@micromelon.com.au>
Date: Tue, 24 Oct 2023 17:35:26 +1000
Subject: [PATCH] Switched to main instead of master for libs push

---
 kibot-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kibot-ci.yml b/kibot-ci.yml
index f7ae816..bfde858 100644
--- a/kibot-ci.yml
+++ b/kibot-ci.yml
@@ -135,7 +135,7 @@ image:
         for d in "libs/melonlib" "libs/melon3d" 
           do
             cd $d
-            if [ $(git rev-parse HEAD) != $(git rev-parse master) ]
+            if [ $(git rev-parse HEAD) != $(git rev-parse main) ]
             then
               CURR_B=$(git config -f $CI_PROJECT_DIR/.gitmodules submodule.$d.branch)
               echo CURR_B
@@ -145,7 +145,7 @@ image:
               git commit --allow-empty -m "Merge"
               echo "about to push"
               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
             cd $CI_PROJECT_DIR
           done