diff --git a/kibot-ci.yml b/kibot-ci.yml index c6f7db1..346eb6e 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -114,10 +114,16 @@ image: for d in "libs/melonlib" "libs/melon3d" do cd $d + if [ $d == "libs/melonlib" ] + then + TOKEN=$KI_LIB_TOKEN + else + TOKEN=$KI_LIB_3D_TOKEN + fi SHA=$(git rev-parse HEAD) CURR_B=$(git name-rev --name-only $SHA) REPO=$(basename $(git remote get-url origin)) - git remote add gl_origin https://oauth2:$PRJ_AUTH_TOKEN@gitlab.com/Micromelon/eduation/hardware/$REPO + 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" 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