Entonez/KCauldronX
1
0
Fork 0
forked from xjboss/KCauldronX
Code Releases Activity

Add support for 1558 backport into CI

Browse Source
This commit is contained in:
Sergey Shatunov
2016-01-04 23:01:21 +07:00
parent 664be786d4
commit 90386d0abf
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.gitlab-ci.yml
View File

@@ -21,17 +21,18 @@ Deploy:
- deploy - deploy
only: only:
- master - master
- backport-1558
- backport-1448 - backport-1448
- backport-1388 - backport-1388
- backport-1370 - backport-1370
- backport-1291 - backport-1291
- backport-1240 - backport-1240
Merge master into backport-1448: Merge master into backport-1558:
script: script:
- 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-1558
- git remote set-url origin gitlab@prok.pw:KCauldron/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
@@ -45,6 +46,24 @@ Merge master into backport-1448:
only: only:
- master - master
Merge backport-1558 into backport-1448:
script:
- rm -rf $(grep path .gitmodules | awk '{print $3}')
- from=backport-1558
- to=backport-1448
- git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
- git fetch origin $to
- git checkout $to
- git reset --hard origin/$to
- git merge origin/$from
- git push origin $to
- rm -rf $(grep path .gitmodules | awk '{print $3}')
type: deploy
tags:
- merge-backport
only:
- backport-1558
Merge backport-1448 into backport-1388: Merge backport-1448 into backport-1388:
script: script:
- rm -rf $(grep path .gitmodules | awk '{print $3}') - rm -rf $(grep path .gitmodules | awk '{print $3}')