From de6695158feb0d4a0b71d6df63c6cc419e18cac7 Mon Sep 17 00:00:00 2001 From: andrewc Date: Tue, 24 Oct 2023 11:33:37 +1000 Subject: [PATCH] Fixing up pushing to libs on release by using auth token --- kibot-ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kibot-ci.yml b/kibot-ci.yml index aeb5287..c6f7db1 100644 --- a/kibot-ci.yml +++ b/kibot-ci.yml @@ -114,9 +114,13 @@ image: for d in "libs/melonlib" "libs/melon3d" do cd $d - CURR_B=$(git rev-parse --abbrev-ref HEAD) + 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 checkout $CURR_B git commit --allow-empty -m "Merge" - git push 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 done fi