forked from xjboss/KCauldronX
Update CI config
This commit is contained in:
parent
831c8733cc
commit
bbacdc3e87
@ -1,15 +1,12 @@
|
||||
Compile:
|
||||
# This file is generated by GitLab CI
|
||||
Source test:
|
||||
script:
|
||||
- git submodule update --init --recursive
|
||||
- ./gradlew clean setupCauldron jar
|
||||
tags:
|
||||
- test
|
||||
only:
|
||||
- master
|
||||
- backport-1388
|
||||
- backport-1370
|
||||
- backport-1291
|
||||
- backport-1240
|
||||
except:
|
||||
- tags
|
||||
|
||||
Deploy:
|
||||
script:
|
||||
@ -18,63 +15,71 @@ Deploy:
|
||||
type: deploy
|
||||
tags:
|
||||
- deploy
|
||||
only:
|
||||
only:
|
||||
- master
|
||||
- backport-1388
|
||||
- backport-1370
|
||||
- backport-1291
|
||||
- backport-1240
|
||||
|
||||
Merge master to backport-1388:
|
||||
Merge master into backport-1388:
|
||||
script:
|
||||
- from=master
|
||||
- to=backport-1388
|
||||
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git
|
||||
- git fetch origin
|
||||
- git checkout backport-1388
|
||||
- git reset --hard origin/backport-1388
|
||||
- git merge origin/master
|
||||
- git push origin backport-1388
|
||||
- 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:
|
||||
- master
|
||||
|
||||
Merge backport-1388 to backport-1370:
|
||||
Merge backport-1388 into backport-1370:
|
||||
script:
|
||||
- from=backport-1388
|
||||
- to=backport-1370
|
||||
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git
|
||||
- git fetch origin
|
||||
- git checkout backport-1370
|
||||
- git reset --hard origin/backport-1370
|
||||
- git merge origin/backport-1388
|
||||
- git push origin backport-1370
|
||||
- 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-1388
|
||||
|
||||
Merge backport-1370 to backport-1291:
|
||||
Merge backport-1370 into backport-1291:
|
||||
script:
|
||||
- from=backport-1370
|
||||
- to=backport-1291
|
||||
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git
|
||||
- git fetch origin
|
||||
- git checkout backport-1291
|
||||
- git reset --hard origin/backport-1291
|
||||
- git merge origin/backport-1370
|
||||
- git push origin backport-1291
|
||||
- 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-1370
|
||||
|
||||
Merge backport-1291 to backport-1240:
|
||||
Merge backport-1291 into backport-1240:
|
||||
script:
|
||||
- from=backport-1291
|
||||
- to=backport-1240
|
||||
- git remote set-url origin gitlab@prok.pw:Prototik/KCauldron.git
|
||||
- git fetch origin
|
||||
- git checkout backport-1240
|
||||
- git reset --hard origin/backport-1240
|
||||
- git merge origin/backport-1291
|
||||
- git push origin backport-1240
|
||||
- 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
|
||||
|
Loading…
Reference in New Issue
Block a user