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

Trying different method of getting branch for libs push

Browse Source
This commit is contained in:
andrewc
2023-10-24 14:12:29 +10:00
parent 1c2d4d73a0
commit 21db630938
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kibot-ci.yml
View File

@@ -124,12 +124,12 @@ image:
REPO=$(basename $(git remote get-url origin)) REPO=$(basename $(git remote get-url origin))
git remote set-url origin https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO git remote set-url origin https://ci_push:$TOKEN@gitlab.com/Micromelon/education/hardware/$REPO
git fetch --all git fetch --all
CURR_B=$(git name-rev --name-only $(git rev-parse HEAD)) CURR_B=$(git branch --remote --verbose --no-abbrev --contains | sed -rne 's/^[^\/]*\/([^\ ]+).*$/\1/p')
git rev-parse HEAD git rev-parse HEAD
git branch git branch
git remote get-url origin git remote get-url origin
echo $CURR_B echo $CURR_B
git checkout $CURR_B git checkout origin/$CURR_B
git commit --allow-empty -m "Merge" git commit --allow-empty -m "Merge"
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 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 cd $CI_PROJECT_DIR