diff --git a/kibot-ci.yml b/kibot-ci.yml index 60e2aea..1e3f684 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -121,15 +121,14 @@ image: else TOKEN=$KI_LIB_3D_TOKEN fi + REPO=$(basename $(git remote get-url origin)) + git remote set-url origin https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO git fetch --all CURR_B=$(git name-rev --name-only $(git rev-parse HEAD)) - REPO=$(basename $(git remote get-url origin)) 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 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 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 done fi