1 changed files with 37 additions and 32 deletions
@ -1,15 +1,12 @@ |
|||||||
Compile: |
# This file is generated by GitLab CI |
||||||
|
Source test: |
||||||
script: |
script: |
||||||
- git submodule update --init --recursive |
- git submodule update --init --recursive |
||||||
- ./gradlew clean setupCauldron jar |
- ./gradlew clean setupCauldron jar |
||||||
tags: |
tags: |
||||||
- test |
- test |
||||||
only: |
except: |
||||||
- master |
- tags |
||||||
- backport-1388 |
|
||||||
- backport-1370 |
|
||||||
- backport-1291 |
|
||||||
- backport-1240 |
|
||||||
|
|
||||||
Deploy: |
Deploy: |
||||||
script: |
script: |
||||||
@ -18,63 +15,71 @@ Deploy: |
|||||||
type: deploy |
type: deploy |
||||||
tags: |
tags: |
||||||
- deploy |
- deploy |
||||||
only: |
only: |
||||||
- master |
- master |
||||||
- backport-1388 |
- backport-1388 |
||||||
- backport-1370 |
- backport-1370 |
||||||
- backport-1291 |
- backport-1291 |
||||||
- backport-1240 |
- backport-1240 |
||||||
|
|
||||||
Merge master to backport-1388: |
Merge master into backport-1388: |
||||||
script: |
script: |
||||||
|
- from=master |
||||||
|
- to=backport-1388 |
||||||
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
||||||
- git fetch origin |
- git fetch origin $to |
||||||
- git checkout backport-1388 |
- git checkout $to |
||||||
- git reset --hard origin/backport-1388 |
- git reset --hard origin/$to |
||||||
- git merge origin/master |
- git merge origin/$from |
||||||
- git push origin backport-1388 |
- git push origin $to |
||||||
type: deploy |
type: deploy |
||||||
tags: |
tags: |
||||||
- merge-backport |
- merge-backport |
||||||
only: |
only: |
||||||
- master |
- master |
||||||
|
|
||||||
Merge backport-1388 to backport-1370: |
Merge backport-1388 into backport-1370: |
||||||
script: |
script: |
||||||
|
- from=backport-1388 |
||||||
|
- to=backport-1370 |
||||||
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
||||||
- git fetch origin |
- git fetch origin $to |
||||||
- git checkout backport-1370 |
- git checkout $to |
||||||
- git reset --hard origin/backport-1370 |
- git reset --hard origin/$to |
||||||
- git merge origin/backport-1388 |
- git merge origin/$from |
||||||
- git push origin backport-1370 |
- git push origin $to |
||||||
type: deploy |
type: deploy |
||||||
tags: |
tags: |
||||||
- merge-backport |
- merge-backport |
||||||
only: |
only: |
||||||
- backport-1388 |
- backport-1388 |
||||||
|
|
||||||
Merge backport-1370 to backport-1291: |
Merge backport-1370 into backport-1291: |
||||||
script: |
script: |
||||||
|
- from=backport-1370 |
||||||
|
- to=backport-1291 |
||||||
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
||||||
- git fetch origin |
- git fetch origin $to |
||||||
- git checkout backport-1291 |
- git checkout $to |
||||||
- git reset --hard origin/backport-1291 |
- git reset --hard origin/$to |
||||||
- git merge origin/backport-1370 |
- git merge origin/$from |
||||||
- git push origin backport-1291 |
- git push origin $to |
||||||
type: deploy |
type: deploy |
||||||
tags: |
tags: |
||||||
- merge-backport |
- merge-backport |
||||||
only: |
only: |
||||||
- backport-1370 |
- backport-1370 |
||||||
|
|
||||||
Merge backport-1291 to backport-1240: |
Merge backport-1291 into backport-1240: |
||||||
script: |
script: |
||||||
|
- from=backport-1291 |
||||||
|
- to=backport-1240 |
||||||
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
- git remote set-url origin [email protected]:Prototik/KCauldron.git |
||||||
- git fetch origin |
- git fetch origin $to |
||||||
- git checkout backport-1240 |
- git checkout $to |
||||||
- git reset --hard origin/backport-1240 |
- git reset --hard origin/$to |
||||||
- git merge origin/backport-1291 |
- git merge origin/$from |
||||||
- git push origin backport-1240 |
- git push origin $to |
||||||
type: deploy |
type: deploy |
||||||
tags: |
tags: |
||||||
- merge-backport |
- merge-backport |
||||||
|
Loading…
Reference in new issue