diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0af4a1d..3790266 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,6 +11,7 @@ stages: - build - docker - deploy + - sync cache: key: ${CI_COMMIT_REF_SLUG} @@ -94,3 +95,21 @@ deploy: only: - dev - production + +# ------------------ New sync job added below ------------------ + +sync_branches: + stage: sync + image: alpine/git:latest + rules: + - if: '$CI_COMMIT_BRANCH == "production"' + script: + - | + git config --global user.email "gitlab-ci@rheinsw.com" + git config --global user.name "RheinSW GitLab CI" + git remote set-url origin "https://oauth2:${CI_JOB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git" + + git checkout dev + git pull origin dev + git merge --no-ff origin/production + git push origin dev