diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ede857c..0eaba56 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -21,17 +21,18 @@ Deploy: - deploy only: - master + - backport-1558 - backport-1448 - backport-1388 - backport-1370 - backport-1291 - backport-1240 -Merge master into backport-1448: +Merge master into backport-1558: script: - rm -rf $(grep path .gitmodules | awk '{print $3}') - from=master - - to=backport-1448 + - to=backport-1558 - git remote set-url origin gitlab@prok.pw:KCauldron/KCauldron.git - git fetch origin $to - git checkout $to @@ -44,6 +45,24 @@ Merge master into backport-1448: - merge-backport only: - 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: script: