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

Fetch before getting branches

Browse Source
This commit is contained in:
andrewc
2023-10-24 13:35:45 +10:00
parent b8ea218024
commit f09785a98f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kibot-ci.yml
View File

@@ -111,6 +111,7 @@ image:
if [[ $GITLAB_CI == 'true' && $CI_COMMIT_BRANCH == "main" ]]; then if [[ $GITLAB_CI == 'true' && $CI_COMMIT_BRANCH == "main" ]]; then
git config --global user.name "KicadCi" git config --global user.name "KicadCi"
git config --global user.email "andrew@micromelon.com.au" git config --global user.email "andrew@micromelon.com.au"
cd $CI_PROJECT_DIR
for d in "libs/melonlib" "libs/melon3d" for d in "libs/melonlib" "libs/melon3d"
do do
cd $d cd $d
@@ -120,13 +121,13 @@ image:
else else
TOKEN=$KI_LIB_3D_TOKEN TOKEN=$KI_LIB_3D_TOKEN
fi fi
SHA=$(git rev-parse HEAD) git fetch --all
CURR_B=$(git name-rev --name-only $SHA) CURR_B=$(git name-rev --name-only $(git rev-parse HEAD))
REPO=$(basename $(git remote get-url origin)) REPO=$(basename $(git remote get-url origin))
git remote add gl_origin https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO
git checkout $CURR_B
git commit --allow-empty -m "Merge"
echo $CURR_B echo $CURR_B
git checkout $CURR_B
git remote add gl_origin https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO
git commit --allow-empty -m "Merge"
git remote get-url gl_origin git remote get-url gl_origin
git push gl_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 gl_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
cd $CI_PROJECT_DIR cd $CI_PROJECT_DIR