xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Fix backport merging

Browse Source
This commit is contained in:
Prototik 2015-10-24 21:17:35 +07:00
parent 1ec4cf134d
commit da067694cc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -32,7 +32,7 @@ Merge master into backport-1448:
- rm -rf $(grep path .gitmodules | awk '{print $3}') - rm -rf $(grep path .gitmodules | awk '{print $3}')
- from=master - from=master
- to=backport-1448 - to=backport-1448
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
- git fetch origin $to - git fetch origin $to
- git checkout $to - git checkout $to
- git reset --hard origin/$to - git reset --hard origin/$to
@ -50,7 +50,7 @@ Merge backport-1448 into backport-1388:
- rm -rf $(grep path .gitmodules | awk '{print $3}') - rm -rf $(grep path .gitmodules | awk '{print $3}')
- from=backport-1448 - from=backport-1448
- to=backport-1388 - to=backport-1388
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
- git fetch origin $to - git fetch origin $to
- git checkout $to - git checkout $to
- git reset --hard origin/$to - git reset --hard origin/$to
@ -68,7 +68,7 @@ Merge backport-1388 into backport-1370:
- rm -rf $(grep path .gitmodules | awk '{print $3}') - rm -rf $(grep path .gitmodules | awk '{print $3}')
- from=backport-1388 - from=backport-1388
- to=backport-1370 - to=backport-1370
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
- git fetch origin $to - git fetch origin $to
- git checkout $to - git checkout $to
- git reset --hard origin/$to - git reset --hard origin/$to
@ -86,7 +86,7 @@ Merge backport-1370 into backport-1291:
- rm -rf $(grep path .gitmodules | awk '{print $3}') - rm -rf $(grep path .gitmodules | awk '{print $3}')
- from=backport-1370 - from=backport-1370
- to=backport-1291 - to=backport-1291
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
- git fetch origin $to - git fetch origin $to
- git checkout $to - git checkout $to
- git reset --hard origin/$to - git reset --hard origin/$to
@ -104,7 +104,7 @@ Merge backport-1291 into backport-1240:
- rm -rf $(grep path .gitmodules | awk '{print $3}') - rm -rf $(grep path .gitmodules | awk '{print $3}')
- from=backport-1291 - from=backport-1291
- to=backport-1240 - to=backport-1240
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
- git fetch origin $to - git fetch origin $to
- git checkout $to - git checkout $to
- git reset --hard origin/$to - git reset --hard origin/$to