2015-06-27 22:17:26 +00:00
|
|
|
# This file is generated by GitLab CI
|
|
|
|
Source test:
|
2015-06-27 21:35:19 +00:00
|
|
|
script:
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
- git submodule update --init --recursive
|
|
|
|
- ./gradlew clean setupCauldron jar
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
tags:
|
|
|
|
- test
|
2015-06-27 22:17:26 +00:00
|
|
|
except:
|
|
|
|
- tags
|
2015-06-27 21:35:19 +00:00
|
|
|
|
|
|
|
Deploy:
|
|
|
|
script:
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
- git submodule update --init --recursive
|
|
|
|
- ./gradlew -PofficialBuild clean setupCauldron publish
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
type: deploy
|
|
|
|
tags:
|
|
|
|
- deploy
|
2015-07-07 09:34:54 +00:00
|
|
|
only:
|
|
|
|
- master
|
|
|
|
- backport-1448
|
|
|
|
- backport-1388
|
|
|
|
- backport-1370
|
|
|
|
- backport-1291
|
|
|
|
- backport-1240
|
2015-06-27 21:35:19 +00:00
|
|
|
|
2015-07-07 09:34:54 +00:00
|
|
|
Merge master into backport-1448:
|
2015-06-27 21:35:19 +00:00
|
|
|
script:
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 22:17:26 +00:00
|
|
|
- from=master
|
2015-07-07 09:34:54 +00:00
|
|
|
- to=backport-1448
|
2015-10-24 14:17:35 +00:00
|
|
|
- git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
|
2015-06-27 22:17:26 +00:00
|
|
|
- git fetch origin $to
|
|
|
|
- git checkout $to
|
|
|
|
- git reset --hard origin/$to
|
|
|
|
- git merge origin/$from
|
|
|
|
- git push origin $to
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
type: deploy
|
|
|
|
tags:
|
|
|
|
- merge-backport
|
|
|
|
only:
|
|
|
|
- master
|
|
|
|
|
2015-07-07 09:34:54 +00:00
|
|
|
Merge backport-1448 into backport-1388:
|
|
|
|
script:
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-07-07 09:34:54 +00:00
|
|
|
- from=backport-1448
|
|
|
|
- to=backport-1388
|
2015-10-24 14:17:35 +00:00
|
|
|
- git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
|
2015-07-07 09:34:54 +00:00
|
|
|
- git fetch origin $to
|
|
|
|
- git checkout $to
|
|
|
|
- git reset --hard origin/$to
|
|
|
|
- git merge origin/$from
|
|
|
|
- git push origin $to
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-07-07 09:34:54 +00:00
|
|
|
type: deploy
|
|
|
|
tags:
|
|
|
|
- merge-backport
|
|
|
|
only:
|
|
|
|
- backport-1448
|
|
|
|
|
2015-06-27 22:17:26 +00:00
|
|
|
Merge backport-1388 into backport-1370:
|
2015-06-27 21:35:19 +00:00
|
|
|
script:
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 22:17:26 +00:00
|
|
|
- from=backport-1388
|
|
|
|
- to=backport-1370
|
2015-10-24 14:17:35 +00:00
|
|
|
- git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
|
2015-06-27 22:17:26 +00:00
|
|
|
- git fetch origin $to
|
|
|
|
- git checkout $to
|
|
|
|
- git reset --hard origin/$to
|
|
|
|
- git merge origin/$from
|
|
|
|
- git push origin $to
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
type: deploy
|
|
|
|
tags:
|
|
|
|
- merge-backport
|
|
|
|
only:
|
|
|
|
- backport-1388
|
|
|
|
|
2015-06-27 22:17:26 +00:00
|
|
|
Merge backport-1370 into backport-1291:
|
2015-06-27 21:35:19 +00:00
|
|
|
script:
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 22:17:26 +00:00
|
|
|
- from=backport-1370
|
|
|
|
- to=backport-1291
|
2015-10-24 14:17:35 +00:00
|
|
|
- git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
|
2015-06-27 22:17:26 +00:00
|
|
|
- git fetch origin $to
|
|
|
|
- git checkout $to
|
|
|
|
- git reset --hard origin/$to
|
|
|
|
- git merge origin/$from
|
|
|
|
- git push origin $to
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
type: deploy
|
|
|
|
tags:
|
|
|
|
- merge-backport
|
|
|
|
only:
|
|
|
|
- backport-1370
|
|
|
|
|
2015-06-27 22:17:26 +00:00
|
|
|
Merge backport-1291 into backport-1240:
|
2015-06-27 21:35:19 +00:00
|
|
|
script:
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 22:17:26 +00:00
|
|
|
- from=backport-1291
|
|
|
|
- to=backport-1240
|
2015-10-24 14:17:35 +00:00
|
|
|
- git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git
|
2015-06-27 22:17:26 +00:00
|
|
|
- git fetch origin $to
|
|
|
|
- git checkout $to
|
|
|
|
- git reset --hard origin/$to
|
|
|
|
- git merge origin/$from
|
|
|
|
- git push origin $to
|
2015-10-21 16:37:43 +00:00
|
|
|
- rm -rf $(grep path .gitmodules | awk '{print $3}')
|
2015-06-27 21:35:19 +00:00
|
|
|
type: deploy
|
|
|
|
tags:
|
|
|
|
- merge-backport
|
|
|
|
only:
|
|
|
|
- backport-1291
|