xjboss/KCauldronX
3
0
Fork 1
Code Releases Activity

Backport for 1448

Browse Source
This commit is contained in:
Prototik 2015-07-07 16:34:54 +07:00
parent b9e50131e2
commit 801f84d461
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.gitlab-ci.yml
View File

@ -15,13 +15,18 @@ Deploy:
type: deploy type: deploy
tags: tags:
- deploy - deploy
except: only:
- tags - master
- backport-1448
- backport-1388
- backport-1370
- backport-1291
- backport-1240
Merge master into backport-1388: Merge master into backport-1448:
script: script:
- from=master - from=master
- to=backport-1388 - to=backport-1448
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git - git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git
- git fetch origin $to - git fetch origin $to
- git checkout $to - git checkout $to
@ -34,6 +39,22 @@ Merge master into backport-1388:
only: only:
- master - master
Merge backport-1448 into backport-1388:
script:
- from=backport-1448
- to=backport-1388
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git
- git fetch origin $to
- git checkout $to
- git reset --hard origin/$to
- git merge origin/$from
- git push origin $to
type: deploy
tags:
- merge-backport
only:
- backport-1448
Merge backport-1388 into backport-1370: Merge backport-1388 into backport-1370:
script: script:
- from=backport-1388 - from=backport-1388